[xiph-cvs] r6754 - in trunk/oggdsf: . src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic src/lib/codecs/helper/libfishsound src/lib/codecs/helper/libfishsound/doc src/lib/codecs/helper/libfishsound/doc/libfishsound/html src/lib/codecs/helper/libfishsound/doc/libfishsound/latex src/lib/codecs/helper/libfishsound/include src/lib/codecs/helper/libfishsound/include/fishsound src/lib/codecs/helper/libfishsound/src src/lib/codecs/helper/libfishsound/src/examples src/lib/codecs/helper/libfishsound/src/libfishsound src/lib/codecs/helper/libfishsound/src/tests src/lib/codecs/helper/libfishsound/win32 src/lib/codecs/helper/libfishsound/win32/libfishsound src/lib/codecs/speex/filters/dsfSpeexEncoder src/lib/codecs/theora/libs/libOOTheora src/lib/codecs/vorbis/filters/dsfVorbisEncoder src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug src/lib/core/ogg/libOOOgg src/lib/core/ogg/libOOOggSeek src/lib/core/ogg/libogg/win32/Dynamic_Debug website
illiminable at xiph.org
illiminable at xiph.org
Tue May 25 07:20:06 PDT 2004
Author: illiminable
Date: 2004-05-25 10:19:54 -0400 (Tue, 25 May 2004)
New Revision: 6754
Added:
trunk/oggdsf/src/lib/codecs/helper/libfishsound/depcomp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h-source.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundComment.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/comments_8h.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/structFishSoundComment.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/comments.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-decode.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-encode.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-identify.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-info.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/comments.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/comment-test.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-comments.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_tests.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/info.dsp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
Modified:
trunk/oggdsf/VERSIONS
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm
trunk/oggdsf/src/lib/codecs/helper/libfishsound/AUTHORS
trunk/oggdsf/src/lib/codecs/helper/libfishsound/ChangeLog
trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.am
trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/README.win32
trunk/oggdsf/src/lib/codecs/helper/libfishsound/aclocal.m4
trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.guess
trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.h.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.sub
trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure
trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure.ac
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/annotated.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h-source.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/doxygen.css
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/files.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h-source.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions_vars.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_enum.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_eval.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_func.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_type.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__about.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__building.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__configuration.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__decode.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__encode.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__install.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__win32.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/index.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/modules.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundFormat.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundInfo.html
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/Makefile
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/annotated.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/constants_8h.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/doxygen.sty
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/files.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/fishsound_8h.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__about.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__building.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__configuration.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__decode.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__encode.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__install.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__win32.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/index.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/refman.tex
trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.am
trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/constants.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/fishsound.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/install-sh
trunk/oggdsf/src/lib/codecs/helper/libfishsound/ltmain.sh
trunk/oggdsf/src/lib/codecs/helper/libfishsound/missing
trunk/oggdsf/src/lib/codecs/helper/libfishsound/mkinstalldirs
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.am
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.am
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.am
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Version_script.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fishsound.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_compat.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/private.h
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/speex.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/vorbis.c
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.am
trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.in
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/Makefile
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/decode.dsp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encode.dsp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/identify.dsp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsw
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.exp
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj
trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.def
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h
trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm
trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/vorbis_d.exp
trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj
trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm
trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/ogg_d.exp
trunk/oggdsf/website/index.html
Log:
* Updated versions file.
* Updated 0.6.2 libfishsound
* Added start of multi-stream muxing.
* Change codec internals to use new libfishsound api
Modified: trunk/oggdsf/VERSIONS
===================================================================
--- trunk/oggdsf/VERSIONS 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/VERSIONS 2004-05-25 14:19:54 UTC (rev 6754)
@@ -2,7 +2,7 @@
=================================
libspeex - 1.0.3
libvorbis - 1.0.1
-libfishsound - 0.6.0
+libfishsound - 0.6.2
libogg - 1.1.0
libtheora - 1.0alpha3
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic/BuildLog.htm 2004-05-25 14:19:54 UTC (rev 6754)
@@ -14,13 +14,12 @@
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre> ALLUSERSPROFILE=C:\Documents and Settings\All Users
APPDATA=C:\Documents and Settings\illiminable\Application Data
APR_ICONV_PATH=G:\Program Files\Subversion\iconv
- CLIENTNAME=Console
CommonProgramFiles=C:\Program Files\Common Files
COMPUTERNAME=TIGER
ComSpec=C:\WINDOWS\system32\cmd.exe
DX_SDK=c:\dxsdk
HOMEDRIVE=C:
- HOMEPATH=\
+ HOMEPATH=\Documents and Settings\illiminable
INCLUDE=C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib
LIBPATH=
@@ -46,12 +45,12 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
-</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT000003.bat" with contents
+</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT00000E.bat" with contents
[
@echo off
echo on
@@ -63,8 +62,8 @@
exit 1
:VCEnd
]
-Creating command line "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT000003.bat"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000004.rsp" with contents
+Creating command line "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\BAT00000E.bat"
+Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00000F.rsp" with contents
[
/Od /I ".\include" /I "..\..\include" /D "_DEBUG" /D "FLAC_API_EXPORTS" /D "VERSION=\"1.1.0\"" /D "FLAC__CPU_IA32" /D "FLAC__HAS_NASM" /D "FLAC__USE_3DNOW" /D "_WINDOWS" /D "WIN32" /D "_USRDLL" /D "_WINDLL" /FD /EHsc /MDd /GR /Fp".\Debug_dynamic/libFLAC_dynamic.pch" /Fo".\Debug_dynamic/" /Fd".\Debug_dynamic/" /FR".\Debug_dynamic/" /W3 /c /ZI /Gd
stream_encoder_framing.c
@@ -86,8 +85,8 @@
bitmath.c
bitbuffer.c
]
-Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000004.rsp /nologo"
-Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000005.rsp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP00000F.rsp /nologo"
+Creating temporary file "C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000010.rsp" with contents
[
/OUT:"..\..\obj\debug\bin/libFLAC.dll" /INCREMENTAL /NOLOGO /DLL /DEBUG /PDB:".\..\..\obj\debug\lib/libFLAC.pdb" /SUBSYSTEM:WINDOWS /IMPLIB:".\..\..\obj\debug\lib/libFLAC.lib" /MACHINE:I386 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
Debug_dynamic\bitbuffer.obj
@@ -112,7 +111,7 @@
ia32\fixed_asm.obj
ia32\lpc_asm.obj
]
-Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000005.rsp"
+Creating command line "link.exe @C:\DOCUME~1\ILLIMI~1\LOCALS~1\Temp\RSP000010.rsp"
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Output Window
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre>Performing Custom Build Step
Modified: trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/flac/libs/libflac/src/libFLAC++/Debug_dynamic/BuildLog.htm 2004-05-25 14:19:54 UTC (rev 6754)
@@ -14,13 +14,12 @@
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre> ALLUSERSPROFILE=C:\Documents and Settings\All Users
APPDATA=C:\Documents and Settings\illiminable\Application Data
APR_ICONV_PATH=G:\Program Files\Subversion\iconv
- CLIENTNAME=Console
CommonProgramFiles=C:\Program Files\Common Files
COMPUTERNAME=TIGER
ComSpec=C:\WINDOWS\system32\cmd.exe
DX_SDK=c:\dxsdk
HOMEDRIVE=C:
- HOMEPATH=\
+ HOMEPATH=\Documents and Settings\illiminable
INCLUDE=C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib
LIBPATH=
@@ -46,8 +45,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/AUTHORS
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/AUTHORS 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/AUTHORS 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,6 +3,7 @@
Silvia Pfeiffer <<a href="mailto:Silvia.Pfeiffer at CSIRO.AU?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%2>
- MS Windows porting, general packaging.
+
Zentaro Kavanagh <<a href="mailto:zen at illiminable.com?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20src/>
- Windows porting and packaging.
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/ChangeLog
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/ChangeLog 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/ChangeLog 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,3 +1,30 @@
+Fri May 21 14:32:41 EST 2004 Conrad Parker <<a href="mailto:conrad at metadecks.org?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20src>
+
+ * Version 0.6.2
+
+ Improved handling of first and last blocks of data (bos and eos
+ packets in Ogg):
+ * new fish_sound_prepare_truncation() API call
+ * improved encdec-audio test to keep track of frames in and out,
+ and warn if unequal. (Currently not set to FAIL on this condition
+ as it appears to be common for Speex)
+
+ Updates to Win32 nmake build files
+
+Wed May 5 21:44:26 EST 2004 Conrad Parker <<a href="mailto:conrad at metadecks.org?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20src>
+
+ * Version 0.6.1
+
+ Added support for comment packets, tests, and various bugfixes.
+ * Added fish_sound_comment_() API, <fishsound/comments.h>
+ * Fixed segv bug in decoding stereo Speex to non-interleaved
+ * Added test for encode/decode pipeline with a variety of
+ combinations of format, interleave, samplerate, channels and
+ buffer size.
+ * Added tests for comments data structure and encode/decode pipeline
+
+ * Added fish_sound_{get,set}_frameno() API calls
+
Wed Mar 24 17:53:55 EST 2004 Conrad Parker <<a href="mailto:conrad at metadecks.org?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20src>
* Version 0.6.0
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.am 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.am 2004-05-25 14:19:54 UTC (rev 6754)
@@ -39,6 +39,7 @@
win32/identify.dsp \
win32/decode.dsp \
win32/encode.dsp \
+ win32/info.dsp \
win32/libfishsound/libfishsound.sln \
win32/libfishsound/libfishsound.vcproj
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,6 +12,8 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+ at SET_MAKE@
+
# Copyright (C) 2003 CSIRO Australia
#
# Redistribution and use in source and binary forms, with or without
@@ -38,8 +42,6 @@
# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
SHELL = @SHELL@
srcdir = @srcdir@
@@ -60,13 +62,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = .
ACLOCAL = @ACLOCAL@
@@ -74,12 +72,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -88,27 +90,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -122,94 +126,112 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
SUBDIRS = doc include src
-EXTRA_DIST = fishsound.pc.in README.win32 win32/Makefile win32/libfishsound/libfishsound.def win32/config.h win32/libfishsound.dsw win32/libfishsound.dsp win32/identify.dsp win32/decode.dsp win32/encode.dsp win32/libfishsound/libfishsound.sln win32/libfishsound/libfishsound.vcproj
+EXTRA_DIST = fishsound.pc.in README.win32 \
+ win32/Makefile \
+ win32/libfishsound/libfishsound.def \
+ win32/config.h \
+ win32/libfishsound.dsw \
+ win32/libfishsound.dsp \
+ win32/identify.dsp \
+ win32/decode.dsp \
+ win32/encode.dsp \
+ win32/info.dsp \
+ win32/libfishsound/libfishsound.sln \
+ win32/libfishsound/libfishsound.vcproj
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = fishsound.pc
+subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = fishsound.pc
-DATA = $(pkgconfig_DATA)
+CONFIG_CLEAN_FILES = fishsound.pc
+DIST_SOURCES =
+DATA = $(pkgconfig_DATA)
-DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS aclocal.m4 config.guess config.h.in \
-config.sub configure configure.ac fishsound.pc.in install-sh ltmain.sh \
-missing mkinstalldirs
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS aclocal.m4 config.guess config.h.in config.sub \
+ configure configure.ac depcomp fishsound.pc.in install-sh \
+ ltmain.sh missing mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: config.h
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
-$(ACLOCAL_M4): configure.ac
- cd $(srcdir) && $(ACLOCAL)
-
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-config.h: stamp-h
+$(ACLOCAL_M4): configure.ac
+ cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
@if test ! -f $@; then \
- rm -f stamp-h; \
- $(MAKE) stamp-h; \
+ rm -f stamp-h1; \
+ $(MAKE) stamp-h1; \
else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES= CONFIG_HEADERS=config.h \
- $(SHELL) ./config.status
- @echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
- @if test ! -f $@; then \
- rm -f $(srcdir)/stamp-h.in; \
- $(MAKE) $(srcdir)/stamp-h.in; \
- else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOHEADER)
- @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-mostlyclean-hdr:
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+ @rm -f stamp-h1
+ cd $(top_builddir) && $(SHELL) ./config.status config.h
-clean-hdr:
+$(srcdir)/config.h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOHEADER)
+ touch $(srcdir)/config.h.in
distclean-hdr:
- -rm -f config.h
-
-maintainer-clean-hdr:
+ -rm -f config.h stamp-h1
fishsound.pc: $(top_builddir)/config.status fishsound.pc.in
- cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
- fi; fi; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f"; \
+ $(pkgconfigDATA_INSTALL) $$d$$p $(DESTDIR)$(pkgconfigdir)/$$f; \
done
uninstall-pkgconfigDATA:
@$(NORMAL_UNINSTALL)
- list='$(pkgconfig_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f $(DESTDIR)$(pkgconfigdir)/$$f"; \
+ rm -f $(DESTDIR)$(pkgconfigdir)/$$f; \
done
# This directory's subdirectories are mostly independent; you can cd
@@ -218,13 +240,8 @@
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-
- at SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -244,13 +261,18 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- test "$$subdir" != "." || dot_seen=yes; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
done; \
- test "$$dot_seen" = "no" && rev=". $$rev"; \
+ rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -267,178 +289,237 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
+ fi; \
done; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-mostlyclean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-clean-tags:
-
distclean-tags:
- -rm -f TAGS ID
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-maintainer-clean-tags:
-
+top_distdir = .
distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- -rm -rf $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
- mkdir $(distdir)/=build
- mkdir $(distdir)/=inst
- dc_install_base=`cd $(distdir)/=inst && pwd`; \
- cd $(distdir)/=build \
- && ../configure --srcdir=.. --prefix=$$dc_install_base \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) dist
- -rm -rf $(distdir)
- @banner="$(distdir).tar.gz is ready for distribution"; \
- dashes=`echo "$$banner" | sed s/./=/g`; \
- echo "$$dashes"; \
- echo "$$banner"; \
- echo "$$dashes"
-dist: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
-dist-all: distdir
- -chmod -R a+r $(distdir)
- GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
- -rm -rf $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distcleancheck_listfiles = find . -type f -print
+
distdir: $(DISTFILES)
- -rm -rf $(distdir)
+ $(am__remove_distdir)
mkdir $(distdir)
- -chmod 777 $(distdir)
- $(mkinstalldirs) $(distdir)/win32 $(distdir)/win32/libfishsound
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ $(mkinstalldirs) $(distdir)/. $(distdir)/doc $(distdir)/src/libfishsound $(distdir)/win32 $(distdir)/win32/libfishsound
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
- for subdir in $(SUBDIRS); do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
- chmod 777 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
+ distdir) \
|| exit 1; \
fi; \
done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+dist-gzip: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+dist dist-all: distdir
+ $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration. Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+ $(am__remove_distdir)
+ GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+ chmod -R a-w $(distdir); chmod a+w $(distdir)
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
+ chmod a-w $(distdir)
+ dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+ && cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base \
+ $(DISTCHECK_CONFIGURE_FLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+ && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+ || { echo "ERROR: files left after uninstall:" ; \
+ find $$dc_install_base -type f -print ; \
+ exit 1; } >&2 ) \
+ && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
+ && rm -f $(distdir).tar.gz \
+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+ $(am__remove_distdir)
+ @echo "$(distdir).tar.gz is ready for distribution" | \
+ sed 'h;s/./=/g;p;x;p;x'
+distcleancheck: distclean
+ if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+ exit 1 ; \
+ fi
+ test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+ || { echo "ERROR: files left after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
check-am: all-am
check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-install-exec-am:
+install: install-recursive
install-exec: install-exec-recursive
-
-install-data-am: install-pkgconfigDATA
install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-pkgconfigDATA
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA) config.h
-all-redirect: all-recursive-am
+
+installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
- $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic clean-libtool mostlyclean-am
-clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+distclean-am: clean-am distclean-generic distclean-hdr distclean-libtool \
+ distclean-tags
-clean: clean-recursive
+dvi: dvi-recursive
-distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
- -rm -f libtool
+dvi-am:
-distclean: distclean-recursive
- -rm -f config.status
+info: info-recursive
-maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
- maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info-am:
+install-data-am: install-pkgconfigDATA
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-recursive
- -rm -f config.status
+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ -rm -rf autom4te.cache
+maintainer-clean-am: distclean-am maintainer-clean-generic
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-uninstall-pkgconfigDATA install-pkgconfigDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+mostlyclean: mostlyclean-recursive
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
- ## Process this file with automake to produce Makefile.in
+uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-libtool clean-recursive dist dist-all \
+ dist-gzip distcheck distclean distclean-generic distclean-hdr \
+ distclean-libtool distclean-recursive distclean-tags \
+ distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-man install-pkgconfigDATA \
+ install-recursive install-strip installcheck installcheck-am \
+ installdirs installdirs-am installdirs-recursive \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-pkgconfigDATA \
+ uninstall-recursive
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/README.win32
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/README.win32 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/README.win32 2004-05-25 14:19:54 UTC (rev 6754)
@@ -30,7 +30,11 @@
Visual Studio.NET 2003 Installation
===================================
+NOTE: For lack of platform, we were not able to keep the solution
+files up-to-date. Please use the Visual Studio Version 6 files
+instead or send us an updated version if you're using these.
+
IMPORTANT: The solution files were built for VS.NET 2003 and can't be
opened by VS.NET 2002. If you use VS.NET 2002 you should use the VS6
workspace files and they will be automatically converted to the new
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/aclocal.m4
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/aclocal.m4 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/aclocal.m4 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,870 +1,116 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
-# lib-prefix.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# Do all the work for Automake. -*- Autoconf -*-
-dnl From Bruno Haible.
+# This macro actually does too much some checks are only needed if
+# your package does certain things. But this isn't really a big deal.
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
- AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib-prefix],
-[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
- --without-lib-prefix don't search for libraries in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/lib"
- fi
- fi
-])
- if test $use_additional = yes; then
- dnl Potentially add $additional_includedir to $CPPFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- for x in $CPPFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $CPPFLAGS.
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- dnl Potentially add $additional_libdir to $LDFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/lib"; then
- haveit=
- for x in $LDFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LDFLAGS.
- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- fi
-])
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
- dnl Unfortunately, prefix and exec_prefix get only finally determined
- dnl at the end of configure.
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-])
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- $1
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-])
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
-# lib-link.m4 serial 4 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# serial 8
-dnl From Bruno Haible.
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- define([Name],[translit([$1],[./-], [___])])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
- ac_cv_lib[]Name[]_libs="$LIB[]NAME"
- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
- ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
- ])
- LIB[]NAME="$ac_cv_lib[]Name[]_libs"
- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
- INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- dnl results of this search when this library appears as a dependency.
- HAVE_LIB[]NAME=yes
- undefine([Name])
- undefine([NAME])
-])
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. If found, it
-dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
-dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- define([Name],[translit([$1],[./-], [___])])
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+AC_PREREQ([2.52])
- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
+# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
- dnl because if the user has installed lib[]Name and not disabled its use
- dnl via --without-lib[]Name-prefix, he wants to use it.
- ac_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out. PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition. After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $LIB[]NAME"
- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
- LIBS="$ac_save_LIBS"
- ])
- if test "$ac_cv_lib[]Name" = yes; then
- HAVE_LIB[]NAME=yes
- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
- AC_MSG_CHECKING([how to link with lib[]$1])
- AC_MSG_RESULT([$LIB[]NAME])
- else
- HAVE_LIB[]NAME=no
- dnl If $LIB[]NAME didn't lead to a usable library, we don't need
- dnl $INC[]NAME either.
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIB[]NAME=
- LTLIB[]NAME=
- fi
- AC_SUBST([HAVE_LIB]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- undefine([Name])
- undefine([NAME])
-])
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
-dnl hardcode_direct, hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
- ])
- wl="$acl_cv_wl"
- libext="$acl_cv_libext"
- shlibext="$acl_cv_shlibext"
- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- hardcode_direct="$acl_cv_hardcode_direct"
- hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
- AC_ARG_ENABLE(rpath,
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
-])
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib$1-prefix],
-[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
- --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/lib"
- fi
- fi
-])
- dnl Search the library and its dependencies in $additional_libdir and
- dnl $LDFLAGS. Using breadth-first-seach.
- LIB[]NAME=
- LTLIB[]NAME=
- INC[]NAME=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='$1 $2'
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
- dnl or AC_LIB_HAVE_LINKFLAGS call.
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
- else
- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
- dnl that this library doesn't exist. So just drop it.
- :
- fi
- else
- dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME/$LTLIBNAME.
- found_dir=
- found_la=
- found_so=
- found_a=
- if test $use_additional = yes; then
- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
- found_dir="$additional_libdir"
- found_so="$additional_libdir/lib$name.$shlibext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- else
- if test -f "$additional_libdir/lib$name.$libext"; then
- found_dir="$additional_libdir"
- found_a="$additional_libdir/lib$name.$libext"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
- found_dir="$dir"
- found_so="$dir/lib$name.$shlibext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- else
- if test -f "$dir/lib$name.$libext"; then
- found_dir="$dir"
- found_a="$dir/lib$name.$libext"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- dnl Found the library.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
- dnl No hardcoding is needed.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- dnl The hardcoding into $LIBNAME is system dependent.
- if test "$hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding. This affects only
- dnl very old systems.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- fi
- fi
- dnl Assume the include files are nearby.
- additional_includedir=
- case "$found_dir" in
- */lib | */lib/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- dnl Potentially add $additional_includedir to $INCNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's /usr/local/include and we are using GCC on Linux,
- dnl 3. if it's already present in $CPPFLAGS or the already
- dnl constructed $INCNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $INCNAME.
- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- dnl Look for dependencies.
- if test -n "$found_la"; then
- dnl Read the .la file. It defines the variables
- dnl dlname, library_names, old_library, dependency_libs, current,
- dnl age, revision, installed, dlopen, dlpreopen, libdir.
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- dnl We use only dependency_libs.
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 3. if it's already present in $LDFLAGS or the already
- dnl constructed $LIBNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/lib"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/lib"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LIBNAME.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LTLIBNAME.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- dnl Handle this in the next round.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- dnl Handle this in the next round. Throw away the .la's
- dnl directory; it is already contained in a preceding -L
- dnl option.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- dnl Most likely an immediate library name.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
- ;;
- esac
- done
- fi
- else
- dnl Didn't find the library; assume it is in the system directories
- dnl known to the linker and runtime loader. (All the system
- dnl directories known to the linker should also be known to the
- dnl runtime loader, otherwise the system is severely misconfigured.)
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user must
- dnl pass all path elements in one option. We can arrange that for a
- dnl single library, but not when more than one $LIBNAMEs are used.
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
- done
- dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- else
- dnl The -rpath options are cumulative.
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- dnl When using libtool, the option that works for both libraries and
- dnl executables is -R. The -R options are cumulative.
- for found_dir in $ltrpathdirs; do
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
- done
- fi
-])
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
- for element in [$2]; do
- haveit=
- for x in $[$1]; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- [$1]="${[$1]}${[$1]:+ }$element"
- fi
- done
+_AM_IF_OPTION([no-dependencies],,
+[AC_PROVIDE_IFELSE([AC_PROG_][CC],
+ [_AM_DEPENDENCIES(CC)],
+ [define([AC_PROG_][CC],
+ defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_][CXX],
+ defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
-
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License. As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes ;;
-*)
- acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
])
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# 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
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by GCC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]* | [A-Za-z]:[\\/]*)]
- [re_direlt='/[^/][^/]*/\.\./']
- # Canonicalize the path of ld
- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some GNU ld's only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break ;;
- *)
- test "$with_gnu_ld" != yes && break ;;
- esac
- fi
- done
- IFS="$ac_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT($LD)
-else
- AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-
-# Do all the work for Automake. This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
@@ -885,37 +131,103 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.4-p6])])
+ [AM_AUTOMAKE_VERSION([1.6.3])])
+# Helper functions for option handling. -*- Autoconf -*-
+
+# Copyright 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME. Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
#
# Check to make sure that the build environment is sane.
#
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "[$]*" = "X"; then
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
+ set X `ls -t $srcdir/configure conftest.file`
fi
- if test "[$]*" != "X $srcdir/configure conftestfile" \
- && test "[$]*" != "X conftestfile $srcdir/configure"; then
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -925,7 +237,7 @@
alias in your environment])
fi
- test "[$]2" = conftestfile
+ test "$[2]" = conftest.file
)
then
# Ok.
@@ -934,52 +246,597 @@
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-rm -f conftest*
AC_MSG_RESULT(yes)])
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
+# -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
- $1=$2
- AC_MSG_RESULT(found)
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
else
- $1="$3/missing $2"
- AC_MSG_RESULT(missing)
+ am_missing_run=
+ AC_MSG_WARN([`missing' script is too old or missing])
fi
-AC_SUBST($1)])
+])
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
+# AM_AUX_DIR_EXPAND
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory. The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run. This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+# fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+# fails if $ac_aux_dir is absolute,
+# fails when called from a subdirectory in a VPATH build with
+# a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir. In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+# MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH. The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries. This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4 -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery. Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+ [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+
+ am_cv_$1_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ am_cv_$1_dependencies_compiler_type=$depmode
+ break
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+ DEPDIR=.deps
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST([DEPDIR])
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+ fi
+ grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+ # Extract the definition of DEP_FILES from the Makefile without
+ # running `make'.
+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n -e '/^U = / s///p' < "$mf"`
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+ # We invoke sed twice because it is the simplest approach to
+ # changing $(DEPDIR) to its actual value in the expansion.
+ for file in `sed -n -e '
+ /^DEP_FILES = .*\\\\$/ {
+ s/^DEP_FILES = //
+ :loop
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`AS_DIRNAME(["$file"])`
+ AS_MKDIR_P([$dirpart/$fdir])
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled. FIXME. This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*-
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+ @echo done
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
+rm -f confinc confmf
+])
+
+# AM_CONDITIONAL -*- Autoconf -*-
+
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 5
+
+AC_PREREQ(2.52)
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+else
+ $1_TRUE='#'
+ $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+ AC_MSG_ERROR([conditional \"$1\" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_PREREQ([2.52])
+
+# serial 6
+
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated. We must strip everything past the first ":",
+# and everything past the last "/".
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+ [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+ m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+ m4_if(regexp([$1], [^/.*]), -1,
+ [.],
+ patsubst([$1], [^\(/\).*], [\1])),
+ patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+ patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+])# _AM_DIRNAME
+
+
+# The stamp files are numbered to have different names.
+# We could number them on a directory basis, but that's additional
+# complications, let's have a unique counter.
+m4_define([_AM_STAMP_Count], [0])
+
+
+# _AM_STAMP(HEADER)
+# -----------------
+# The name of the stamp file for HEADER.
+AC_DEFUN([_AM_STAMP],
+[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
+AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
+ [:.*])))/stamp-h[]_AM_STAMP_Count])
+
+
+# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
+# ------------------------------------------------------------
+# We used to try to get a real timestamp in stamp-h. But the fear is that
+# that will cause unnecessary cvs conflicts.
+AC_DEFUN([_AM_CONFIG_HEADER],
+[# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+AC_CONFIG_HEADERS([$1],
+ [# update the timestamp
+echo 'timestamp for $1' >"_AM_STAMP([$1])"
+$2],
+ [$3])
+])# _AM_CONFIG_HEADER
+
+
+# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+# --------------------------------------------------------------
AC_DEFUN([AM_CONFIG_HEADER],
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated. We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
- case " <<$>>CONFIG_HEADERS " in
- *" <<$>>am_file "*<<)>>
- echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
- ;;
- esac
- am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
+])# AM_CONFIG_HEADER
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 192 $
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1099,6 +956,9 @@
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# Sed substitution to undo escaping of the cmd sep variable
+unescape_variable_subst='s/\\\(${_S_}\)/\1/g'
+
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
@@ -1148,13 +1008,13 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="\$RANLIB -t \$oldlib\${_S_}$old_postinstall_cmds"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="\$RANLIB \$oldlib\${_S_}$old_postinstall_cmds"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds\${_S_}\$RANLIB \$oldlib"
fi
# Only perform the check for file, if the check method requires it
@@ -1457,7 +1317,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ ppc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -1521,8 +1381,7 @@
# ----------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
+[AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1627,12 +1486,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -1796,7 +1649,7 @@
lt_cv_dlopen_self=yes
])
;;
-
+
*)
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
@@ -1885,6 +1738,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -1908,11 +1768,8 @@
fi
fi
chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -2018,7 +1875,7 @@
else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
- darwin*)
+ NOT-darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
AC_MSG_RESULT([yes])
@@ -2029,7 +1886,7 @@
*)
AC_MSG_RESULT([no])
;;
- esac
+ esac
fi
])# AC_LIBTOOL_SYS_LIB_STRIP
@@ -2130,7 +1987,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -2163,13 +2020,13 @@
yes,cygwin* | yes,mingw* | yes,pw32*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
+ postinstall_cmds='base_file=`basename \${file}`${_S_}
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
+ dldir=$destdir/`dirname \$dlpath`${_S_}
+ test -d \$dldir || mkdir -p \$dldir${_S_}
$install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
+ dlpath=$dir/\$dldll${_S_}
$rm \$dlpath'
shlibpath_overrides_runpath=yes
@@ -2177,7 +2034,7 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -2216,16 +2073,17 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -2243,18 +2101,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -2398,12 +2244,6 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -2413,18 +2253,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -2434,7 +2262,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -2450,7 +2278,7 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -2463,7 +2291,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -2919,7 +2747,7 @@
# AC_PROG_LD
# ----------
-# find the pathname to the GNU or non-GNU linker
+# find the path to the GNU or non-GNU linker
AC_DEFUN([AC_PROG_LD],
[AC_ARG_WITH([gnu-ld],
[AC_HELP_STRING([--with-gnu-ld],
@@ -2945,7 +2773,7 @@
# Accept absolute paths.
[[\\/]]* | ?:[[\\/]]*)
re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
+ # Canonicalize the path of ld
ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -3008,7 +2836,7 @@
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -3033,7 +2861,7 @@
"" | " "*) ;;
*) reload_flag=" $reload_flag" ;;
esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+reload_cmds='$CC -nostdlib -Xlinker$reload_flag $archargs -o $output$reload_objs'
])# AC_PROG_LD_RELOAD_FLAG
@@ -3073,24 +2901,28 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | mingw* | pw32*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='win32_libid'
;;
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
darwin* | rhapsody*)
+ # this will be overwritten by pass_all, but leave it in just in case
+ lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ case "$host_os" in
+ rhapsody* | darwin1.[[012]])
+ lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+ ;;
+ *) # Darwin 1.3 on
+ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+ ;;
+ esac
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3129,21 +2961,39 @@
;;
irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
+ case $host_os in
+ irix5* | nonstopux*)
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+ ;;
+ *)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+ ;;
esac
+ lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=pass_all
;;
# This must be Linux ELF.
linux*)
- lt_cv_deplibs_check_method=pass_all
+ case $host_cpu in
+ alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+ lt_cv_deplibs_check_method=pass_all ;;
+ *)
+ # glibc up to 2.1.1 does not perform some relocations on ARM
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+ esac
+ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;;
-netbsd* | knetbsd*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3157,7 +3007,7 @@
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
-nto-qnx*)
+nto-qnx)
lt_cv_deplibs_check_method=unknown
;;
@@ -3172,6 +3022,9 @@
;;
osf3* | osf4* | osf5*)
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+ lt_cv_file_magic_test_file=/shlib/libc.so
lt_cv_deplibs_check_method=pass_all
;;
@@ -3181,6 +3034,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
+ lt_cv_file_magic_test_file=/lib/libc.so
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -3220,7 +3074,7 @@
# AC_PROG_NM
# ----------
-# find the pathname to a BSD-compatible name lister
+# find the path to a BSD-compatible name lister
AC_DEFUN([AC_PROG_NM],
[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
[if test -n "$NM"; then
@@ -3358,7 +3212,7 @@
AC_DEFUN([_LT_AC_LANG_CXX],
[AC_REQUIRE([AC_PROG_CXX])
AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`])
])# _LT_AC_LANG_CXX
@@ -3374,7 +3228,7 @@
# ---------------
AC_DEFUN([_LT_AC_LANG_F77],
[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,F77" | sed 's/^,//'`])
])# _LT_AC_LANG_F77
@@ -3395,7 +3249,7 @@
[ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
[ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
[AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,GCJ" | sed 's/^,//'`])
])# _LT_AC_LANG_GCJ
@@ -3404,7 +3258,7 @@
# enable support for Windows resource files
AC_DEFUN([AC_LIBTOOL_RC],
[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
+_LT_AC_SHELL_INIT([tagnames=`echo "$tagnames,RC" | sed 's/^,//'`])
])# AC_LIBTOOL_RC
@@ -3446,7 +3300,7 @@
fi
if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ ]]" >/dev/null; then :
+ if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
else
AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
_LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
@@ -3469,9 +3323,9 @@
AC_LIBTOOL_PROG_CC_C_O($1)
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_DLOPEN_SELF($1)
# Report which librarie types wil actually be built
@@ -3487,7 +3341,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -3498,42 +3352,47 @@
fi
;;
darwin* | rhapsody*)
- if test "$GCC" = yes; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[[2-6]].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[[012]])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
- output_verbose_link_cmd='echo'
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
+ output_verbose_link_cmd='echo'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
+ fi
+ ;;
esac
AC_MSG_RESULT([$enable_shared])
@@ -3668,7 +3527,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
fi
# Commands to make compiler produce verbose output that lists
@@ -3797,7 +3656,7 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -3827,7 +3686,7 @@
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
- fi~
+ fi${_S_}
$CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -3835,54 +3694,55 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[[2-6]].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[[012]])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
+ if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
+ fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
+ fi
;;
dgux*)
@@ -3909,7 +3769,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -3931,7 +3791,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
aCC)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname${_S_}$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -3944,7 +3804,7 @@
;;
*)
if test "$GXX" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname${_S_}$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
@@ -4137,7 +3997,7 @@
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -4233,9 +4093,9 @@
cxx)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done${_S_}
+ echo "-hidden">> $lib.exp${_S_}
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib${_S_}
$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4312,8 +4172,8 @@
# Sun C++ 4.2, 5.x and Centerline C++
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4358,8 +4218,8 @@
_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -4369,8 +4229,8 @@
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -4419,9 +4279,9 @@
AC_LIBTOOL_PROG_CC_C_O($1)
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_DLOPEN_SELF($1)
AC_LIBTOOL_CONFIG($1)
@@ -4639,7 +4499,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4663,11 +4523,10 @@
AC_LIBTOOL_PROG_CC_C_O($1)
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-
AC_LIBTOOL_CONFIG($1)
AC_LANG_POP
@@ -4714,9 +4573,9 @@
AC_LIBTOOL_PROG_CC_C_O($1)
AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
AC_LIBTOOL_SYS_LIB_STRIP
+AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
AC_LIBTOOL_DLOPEN_SELF($1)
AC_LIBTOOL_CONFIG($1)
@@ -4781,12 +4640,11 @@
# without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
- fi
+ fi
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -4836,7 +4694,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) | \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
_LT_AC_TAGVAR(module_cmds, $1) | \
- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
_LT_AC_TAGVAR(export_symbols_cmds, $1) | \
extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -4844,7 +4702,7 @@
old_postinstall_cmds | old_postuninstall_cmds | \
sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
# Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\""
;;
*)
eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
@@ -4916,6 +4774,9 @@
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Set the command separator (default: ~)
+_S_=\${LIBTOOL_CMD_SEP-\~}
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -4967,7 +4828,7 @@
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -5242,10 +5103,7 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ test -f Makefile && make "$ltmain"
fi
])# AC_LIBTOOL_CONFIG
@@ -5318,7 +5176,7 @@
symcode='[[BCDEGQRST]]'
;;
solaris* | sysv5*)
- symcode='[[BDRT]]'
+ symcode='[[BDT]]'
;;
sysv4)
symcode='[[DFNSTU]]'
@@ -5336,7 +5194,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
- symcode='[[ABCDGIRSTW]]' ;;
+ symcode='[[ABCDGISTW]]' ;;
esac
# Try without a prefix undercore, then with it.
@@ -5551,7 +5409,7 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -5602,7 +5460,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- ;;
+ ;;
cxx)
# Compaq C++
# Make sure the PIC flag is empty. It appears that all Alpha
@@ -5627,7 +5485,7 @@
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5827,12 +5685,12 @@
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
- ccc*)
+ ccc)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
@@ -5962,7 +5820,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
_LT_AC_TAGVAR(hardcode_automatic, $1)=no
_LT_AC_TAGVAR(module_cmds, $1)=
- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
# include_expsyms should be a list of space-separated symbols to be *always*
@@ -6018,7 +5876,7 @@
;;
amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6060,14 +5918,14 @@
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
- fi~
+ fi${_S_}
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs=no
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -6105,31 +5963,6 @@
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
- fi
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -6157,7 +5990,7 @@
aix3*)
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=yes
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6279,13 +6112,13 @@
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
# This is similar to how AIX traditionally builds it's shared libraries.
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
amigaos*)
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
# see comment about different semantics on the GNU ld section
@@ -6308,7 +6141,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext=".dll"
# FIXME: Setting linknames here is a bad hack.
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -6318,53 +6151,58 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
case "$host_os" in
rhapsody* | darwin1.[[012]])
_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[[012]])
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[[2-6]].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[[012]])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ _LT_AC_TAGVAR(module_cmds, $1)='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_automatic, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
- else
- _LT_AC_TAGVAR(ld_shlibs, $1)=no
- fi
+ fi
;;
dgux*)
@@ -6397,7 +6235,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -6406,9 +6244,9 @@
hpux9*)
if test "$GCC" = yes; then
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
@@ -6484,7 +6322,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6528,7 +6366,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
@@ -6552,8 +6390,8 @@
else
_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_}
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6573,12 +6411,12 @@
_LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
if test "$GCC" = yes; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
else
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6667,8 +6505,8 @@
# $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
@@ -6704,7 +6542,7 @@
if test "$enable_shared" = yes && test "$GCC" = yes; then
case $_LT_AC_TAGVAR(archive_cmds, $1) in
- *'~'*)
+ *"$_S_"*)
# FIXME: we may have to deal with multi-command sequences.
;;
'$CC '*)
@@ -6714,7 +6552,7 @@
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
+
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
lib=conftest
@@ -6876,20 +6714,7 @@
AC_MSG_RESULT([$SED])
])
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi])
-
-
dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
dnl also defines GSTUFF_PKG_ERRORS on error
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.guess
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.guess 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.guess 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2004-01-05'
+timestamp='2003-02-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -106,7 +106,6 @@
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
dummy=$tmp/dummy ;
tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -221,9 +220,6 @@
mvmeppc:OpenBSD:*:*)
echo powerpc-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- pegasos:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
pmax:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -286,9 +282,6 @@
# 1.2 uses "1.2" for uname -r.
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
@@ -310,9 +303,6 @@
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
- *:OS400:*:*)
- echo powerpc-ibm-os400
- exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
@@ -330,9 +320,6 @@
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
- DRS?6000:unix:4.0:6*)
- echo sparc-icl-nx6
- exit 0 ;;
DRS?6000:UNIX_SV:4.2*:7*)
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -740,7 +727,7 @@
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -748,11 +735,6 @@
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -774,10 +756,7 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
- # FreeBSD's kernel, but not the complete OS.
- case ${LIBC} in gnu) kernel_only='k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -788,8 +767,8 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ x86:Interix*:3*)
+ echo i586-pc-interix3
exit 0 ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -810,22 +789,14 @@
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
*:GNU:*:*)
- # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
- *:GNU/*:*:*)
- # other systems with GNU libc and userland
- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit 0 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit 0 ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
- cris:Linux:*:*)
- echo cris-axis-linux-gnu
- exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -904,9 +875,6 @@
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;;
- sh64*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -964,9 +932,6 @@
LIBC=gnuaout
#endif
#endif
- #ifdef __dietlibc__
- LIBC=dietlibc
- #endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
@@ -997,9 +962,6 @@
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
exit 0 ;;
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -1071,7 +1033,7 @@
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1186,7 +1148,7 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
- NSR-?:NONSTOP_KERNEL:*:*)
+ NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1227,12 +1189,6 @@
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
- SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
- *:DRAGONFLY:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
- exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.h.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.h.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.h.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -27,6 +27,9 @@
/* Define to 1 if you have libspeex */
#undef HAVE_SPEEX
+/* Define to 1 if you have libspeex 1.1.x */
+#undef HAVE_SPEEX_1_1
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.sub
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.sub 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/config.sub 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-timestamp='2004-01-05'
+timestamp='2003-02-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -118,8 +118,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -229,14 +228,13 @@
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
- | c4x | clipper \
+ | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
+ | ip2k \
| m32r | m68000 | m68k | m88k | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
@@ -249,7 +247,6 @@
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
- | mipsisa64r2 | mipsisa64r2el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
@@ -264,7 +261,7 @@
| sh64 | sh64le \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
| strongarm \
- | tahoe | thumb | tic4x | tic80 | tron \
+ | tahoe | thumb | tic80 | tron \
| v850 | v850e \
| we32k \
| x86 | xscale | xstormy16 | xtensa \
@@ -307,7 +304,7 @@
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
+ | ip2k-* \
| m32r-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
@@ -322,7 +319,6 @@
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
- | mipsisa64r2-* | mipsisa64r2el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
@@ -377,12 +373,6 @@
basic_machine=a29k-none
os=-bsd
;;
- amd64)
- basic_machine=x86_64-pc
- ;;
- amd64-*)
- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
amdahl)
basic_machine=580-amdahl
os=-sysv
@@ -747,10 +737,6 @@
basic_machine=or32-unknown
os=-coff
;;
- os400)
- basic_machine=powerpc-ibm
- os=-os400
- ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -782,24 +768,18 @@
pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
- pentiumii | pentium2 | pentiumiii | pentium3)
+ pentiumii | pentium2)
basic_machine=i686-pc
;;
- pentium4)
- basic_machine=i786-pc
- ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ pentiumii-* | pentium2-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentium4-*)
- basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
pn)
basic_machine=pn-gould
;;
@@ -858,10 +838,6 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
- sei)
- basic_machine=mips-sei
- os=-seiux
- ;;
sequent)
basic_machine=i386-sequent
;;
@@ -869,9 +845,6 @@
basic_machine=sh-hitachi
os=-hms
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
@@ -946,6 +919,10 @@
basic_machine=t90-cray
os=-unicos
;;
+ tic4x | c4x*)
+ basic_machine=tic4x-unknown
+ os=-coff
+ ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
os=-coff
@@ -971,10 +948,6 @@
tower | tower-32)
basic_machine=m68k-ncr
;;
- tpf)
- basic_machine=s390x-ibm
- os=-tpf
- ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -1143,19 +1116,19 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
+ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ | -powermax* | -dnix*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1179,9 +1152,6 @@
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
- -linux-dietlibc)
- os=-linux-dietlibc
- ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1194,9 +1164,6 @@
-opened*)
os=-openedition
;;
- -os400*)
- os=-os400
- ;;
-wince*)
os=-wince
;;
@@ -1218,9 +1185,6 @@
-atheos*)
os=-atheos
;;
- -syllable*)
- os=-syllable
- ;;
-386bsd)
os=-bsd
;;
@@ -1243,9 +1207,6 @@
-sinix*)
os=-sysv4
;;
- -tpf*)
- os=-tpf
- ;;
-triton*)
os=-sysv3
;;
@@ -1313,9 +1274,6 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1494,15 +1452,9 @@
-mvs* | -opened*)
vendor=ibm
;;
- -os400*)
- vendor=ibm
- ;;
-ptx*)
vendor=sequent
;;
- -tpf*)
- vendor=ibm
- ;;
-vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.57.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -19,10 +20,9 @@
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 ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/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 -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -218,17 +218,16 @@
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="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
@@ -391,9 +390,9 @@
-tagnames=${tagnames+${tagnames},}CXX
+tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
-tagnames=${tagnames+${tagnames},}F77
+tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -463,7 +462,7 @@
# 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 build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HAVE_DOXYGEN HAVE_DOXYGEN_TRUE HAVE_DOXYGEN_FALSE VORBIS_LIBS HAVE_VORBIS_TRUE HAVE_VORBIS_FALSE HAVE_VORBISENC_TRUE HAVE_VORBISENC_FALSE SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE PKG_CONFIG OGGZ_CFLAGS OGGZ_LIBS HAVE_OGGZ_TRUE HAVE_OGGZ_FALSE SNDFILE_CFLAGS SNDFILE_L
IBS HAVE_LIBSNDFILE1_TRUE HAVE_LIBSNDFILE1_FALSE SHLIB_VERSION_ARG SHARED_VERSION_INFO LIBOBJS 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 datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL HAVE_DOXYGEN HAVE_DOXYGEN_TRUE HAVE_DOXYGEN_FALSE FS_DECODE_TRUE FS_DECODE_FALSE FS_ENCODE_TRUE FS_ENCODE_FALSE VORBIS_LIBS HAVE_VORBIS_TRU
E HAVE_VORBIS_FALSE HAVE_VORBISENC_TRUE HAVE_VORBISENC_FALSE SPEEX_LIBS HAVE_SPEEX_TRUE HAVE_SPEEX_FALSE PKG_CONFIG OGGZ_CFLAGS OGGZ_LIBS HAVE_OGGZ_TRUE HAVE_OGGZ_FALSE SNDFILE_CFLAGS SNDFILE_LIBS HAVE_LIBSNDFILE1_TRUE HAVE_LIBSNDFILE1_FALSE SHLIB_VERSION_ARG SHARED_VERSION_INFO LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -822,7 +821,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
@@ -862,10 +861,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; }
@@ -977,9 +976,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
@@ -1024,6 +1023,8 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-dependency-tracking Speeds up one-time builds
+ --enable-dependency-tracking Do not reject slow dependency extractors
--enable-shared[=PKGS]
build shared libraries [default=yes]
--enable-static[=PKGS]
@@ -1096,46 +1097,13 @@
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
@@ -1145,13 +1113,13 @@
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
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -1159,7 +1127,8 @@
if $ac_init_version; then
cat <<\_ACEOF
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1171,7 +1140,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
@@ -1248,19 +1217,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.
@@ -1294,12 +1263,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;
}
@@ -1328,7 +1297,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
@@ -1347,7 +1316,7 @@
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core *.core &&
+ rm -f core core.* *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1427,7 +1396,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"
@@ -1444,13 +1413,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.
@@ -1610,7 +1579,7 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
-am__api_version="1.4"
+am__api_version="1.6"
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -1622,7 +1591,6 @@
# 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
@@ -1639,7 +1607,6 @@
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.
@@ -1647,20 +1614,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
;;
@@ -1694,20 +1661,21 @@
echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
# Just in case
sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
# Do `set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
if test "$*" = "X"; then
# -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
+ set X `ls -t $srcdir/configure conftest.file`
fi
- if test "$*" != "X $srcdir/configure conftestfile" \
- && test "$*" != "X conftestfile $srcdir/configure"; then
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
# if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -1720,7 +1688,7 @@
{ (exit 1); exit 1; }; }
fi
- test "$2" = conftestfile
+ test "$2" = conftest.file
)
then
# Ok.
@@ -1732,7 +1700,6 @@
Check your system clock" >&2;}
{ (exit 1); exit 1; }; }
fi
-rm -f conftest*
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
test "$program_prefix" != NONE &&
@@ -1748,9 +1715,63 @@
program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
rm conftest.sed
+
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+ am_missing_run="$MISSING --run "
+else
+ am_missing_run=
+ { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ 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
+ ac_cv_prog_AWK="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ echo "$as_me:$LINENO: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$AWK" && break
+done
+
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
@@ -1777,17 +1798,19 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-
-PACKAGE=libfishsound
-
-VERSION=0.6.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+ # test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+ test -f $srcdir/config.status; then
{ { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
fi
+# Define the identity of the package.
+ PACKAGE=libfishsound
+ VERSION=0.6.2
+
+
cat >>confdefs.h <<_ACEOF
#define PACKAGE "$PACKAGE"
_ACEOF
@@ -1797,91 +1820,127 @@
#define VERSION "$VERSION"
_ACEOF
+# Some tools Automake needs.
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
-echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
- ACLOCAL=aclocal-${am__api_version}
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'. However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
else
- ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
- echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
+ if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ 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
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-echo "$as_me:$LINENO: checking for working autoconf" >&5
-echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
- AUTOCONF=autoconf
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ echo "$as_me:$LINENO: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
else
- AUTOCONF="$missing_dir/missing autoconf"
- echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
-echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
- AUTOMAKE=automake-${am__api_version}
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
- AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
- echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ 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
+ ac_cv_prog_ac_ct_STRIP="strip"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-echo "$as_me:$LINENO: checking for working autoheader" >&5
-echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
- AUTOHEADER=autoheader
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
else
- AUTOHEADER="$missing_dir/missing autoheader"
- echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
fi
-echo "$as_me:$LINENO: checking for working makeinfo" >&5
-echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
- MAKEINFO=makeinfo
- echo "$as_me:$LINENO: result: found" >&5
-echo "${ECHO_T}found" >&6
+ STRIP=$ac_ct_STRIP
else
- MAKEINFO="$missing_dir/missing makeinfo"
- echo "$as_me:$LINENO: result: missing" >&5
-echo "${ECHO_T}missing" >&6
+ STRIP="$ac_cv_prog_STRIP"
fi
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+# We need awk for the "check" target. The system "awk" is bad on
+# some platforms.
+
+
+# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
ac_config_headers="$ac_config_headers config.h"
- ac_config_commands="$ac_config_commands default-1"
+
SHARED_VERSION_INFO="1:0:0"
SHLIB_VERSION_ARG=""
@@ -2222,6 +2281,7 @@
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2241,8 +2301,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 file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output" >&5
+echo $ECHO_N "checking for C compiler default output... $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
@@ -2262,23 +2322,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
@@ -2352,8 +2412,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
@@ -2378,6 +2438,7 @@
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
@@ -2428,6 +2489,7 @@
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
@@ -2447,24 +2509,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -2473,7 +2526,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -2489,6 +2542,7 @@
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
@@ -2505,24 +2559,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -2531,7 +2576,7 @@
ac_cv_prog_cc_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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
@@ -2558,6 +2603,7 @@
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
@@ -2585,16 +2631,6 @@
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);};
@@ -2621,24 +2657,15 @@
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -2647,7 +2674,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext
+rm -f conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=$ac_save_CC
@@ -2675,27 +2702,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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 ();' \
@@ -2703,13 +2722,14 @@
'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 ()
{
@@ -2720,24 +2740,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -2746,8 +2757,9 @@
continue
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2764,24 +2776,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -2789,7 +2792,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2803,13 +2806,155 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
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
+rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+ DEPDIR=.deps
+else
+ # MS-DOS does not allow filenames that begin with a dot.
+ DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+
+ ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+ @echo done
+END
+# If we don't find an include directive, just comment out the code.
+echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ fi
+fi
+
+
+echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval="$enable_dependency_tracking"
+
+fi;
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+
+
+depcc="$CC" am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
# Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then
enableval="$enable_shared"
@@ -2978,7 +3123,7 @@
# Accept absolute paths.
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
+ # Canonicalize the path of ld
ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -3047,7 +3192,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -3075,7 +3220,7 @@
"" | " "*) ;;
*) reload_flag=" $reload_flag" ;;
esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+reload_cmds='$CC -nostdlib -Xlinker$reload_flag $archargs -o $output$reload_objs'
echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
@@ -3168,24 +3313,28 @@
lt_cv_file_magic_test_file=/shlib/libc.so
;;
-cygwin*)
+cygwin* | mingw* | pw32*)
# win32_libid is a shell function defined in ltmain.sh
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='win32_libid'
;;
-mingw* | pw32*)
- # Base MSYS/MinGW do not provide the 'file' command needed by
- # win32_libid shell function, so use a weaker test based on 'objdump'.
- lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
- lt_cv_file_magic_cmd='$OBJDUMP -f'
- ;;
-
darwin* | rhapsody*)
+ # this will be overwritten by pass_all, but leave it in just in case
+ lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ case "$host_os" in
+ rhapsody* | darwin1.[012])
+ lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+ ;;
+ *) # Darwin 1.3 on
+ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+ ;;
+ esac
lt_cv_deplibs_check_method=pass_all
;;
-freebsd* | kfreebsd*-gnu)
+freebsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
@@ -3224,21 +3373,39 @@
;;
irix5* | irix6* | nonstopux*)
- case $LD in
- *-32|*"-32 ") libmagic=32-bit;;
- *-n32|*"-n32 ") libmagic=N32;;
- *-64|*"-64 ") libmagic=64-bit;;
- *) libmagic=never-match;;
+ case $host_os in
+ irix5* | nonstopux*)
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+ ;;
+ *)
+ case $LD in
+ *-32|*"-32 ") libmagic=32-bit;;
+ *-n32|*"-n32 ") libmagic=N32;;
+ *-64|*"-64 ") libmagic=64-bit;;
+ *) libmagic=never-match;;
+ esac
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
+ ;;
esac
+ lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
lt_cv_deplibs_check_method=pass_all
;;
# This must be Linux ELF.
linux*)
- lt_cv_deplibs_check_method=pass_all
+ case $host_cpu in
+ alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
+ lt_cv_deplibs_check_method=pass_all ;;
+ *)
+ # glibc up to 2.1.1 does not perform some relocations on ARM
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;;
+ esac
+ lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
;;
-netbsd* | knetbsd*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -3252,7 +3419,7 @@
lt_cv_file_magic_test_file=/usr/lib/libnls.so
;;
-nto-qnx*)
+nto-qnx)
lt_cv_deplibs_check_method=unknown
;;
@@ -3267,6 +3434,9 @@
;;
osf3* | osf4* | osf5*)
+ # this will be overridden with pass_all, but let us keep it just in case
+ lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+ lt_cv_file_magic_test_file=/shlib/libc.so
lt_cv_deplibs_check_method=pass_all
;;
@@ -3276,6 +3446,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
+ lt_cv_file_magic_test_file=/lib/libc.so
;;
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -3355,7 +3526,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3358 "configure"' > conftest.$ac_ext
+ echo '#line 3529 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3404,7 +3575,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*|powerpc64-*linux*)
+ ppc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -3452,6 +3623,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3468,24 +3640,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
lt_cv_cc_needs_belf=yes
else
@@ -3494,8 +3657,7 @@
lt_cv_cc_needs_belf=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3544,6 +3706,7 @@
# 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
@@ -3554,7 +3717,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
@@ -3566,7 +3729,6 @@
(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
@@ -3587,6 +3749,7 @@
# 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
@@ -3604,7 +3767,6 @@
(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
@@ -3651,6 +3813,7 @@
# 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
@@ -3661,7 +3824,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
@@ -3673,7 +3836,6 @@
(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
@@ -3694,6 +3856,7 @@
# 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
@@ -3711,7 +3874,6 @@
(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
@@ -3757,6 +3919,7 @@
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
@@ -3777,24 +3940,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -3803,11 +3957,12 @@
ac_cv_header_stdc=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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
@@ -3829,6 +3984,7 @@
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
@@ -3853,6 +4009,7 @@
:
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3864,9 +4021,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
@@ -3877,7 +4034,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);
}
@@ -3902,7 +4059,7 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -3927,7 +4084,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
@@ -3936,6 +4093,7 @@
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
@@ -3947,24 +4105,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -3973,7 +4122,7 @@
eval "$as_ac_Header=no"
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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
@@ -4004,6 +4153,7 @@
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4014,24 +4164,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -4040,7 +4181,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -4048,6 +4189,7 @@
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4065,7 +4207,6 @@
(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
@@ -4085,32 +4226,33 @@
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
;;
- no:yes:* )
+ no:yes )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -4121,7 +4263,7 @@
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=\$ac_header_preproc"
+ eval "$as_ac_Header=$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -4255,6 +4397,7 @@
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
@@ -4274,24 +4417,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -4300,7 +4434,7 @@
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
@@ -4316,6 +4450,7 @@
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
@@ -4332,24 +4467,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_cxx_g=yes
else
@@ -4358,7 +4484,7 @@
ac_cv_prog_cxx_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -4378,7 +4504,8 @@
fi
fi
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 ();' \
@@ -4386,13 +4513,14 @@
'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 ()
{
@@ -4403,24 +4531,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -4429,8 +4548,9 @@
continue
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4447,24 +4567,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -4472,7 +4583,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -4487,6 +4598,75 @@
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+depcc="$CXX" am_compiler_list=
+
+echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+
+ am_cv_CXX_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ echo '#include "conftest.h"' > conftest.c
+ echo 'int i;' > conftest.h
+ echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=conftest.c object=conftest.o \
+ depfile=conftest.Po tmpdepfile=conftest.TPo \
+ $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
+ grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ am_cv_CXX_dependencies_compiler_type=$depmode
+ break
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CXX_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+
ac_ext=cc
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4511,6 +4691,7 @@
# 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
@@ -4521,7 +4702,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
@@ -4533,7 +4714,6 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=
fi
@@ -4554,6 +4734,7 @@
# 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
@@ -4571,7 +4752,6 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=
fi
@@ -4618,6 +4798,7 @@
# 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
@@ -4628,7 +4809,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
@@ -4640,7 +4821,6 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=
fi
@@ -4661,6 +4841,7 @@
# 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
@@ -4678,7 +4859,6 @@
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
else
ac_cpp_err=
fi
@@ -4723,7 +4903,7 @@
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -4765,7 +4945,7 @@
fi
if test -z "$F77"; then
ac_ct_F77=$F77
- for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
+ for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 lf95 g95
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -4810,7 +4990,7 @@
# Provide some information about the compiler.
-echo "$as_me:4813:" \
+echo "$as_me:4993:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -4828,10 +5008,9 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-rm -f a.out
# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file. (Note that this only needs to work for GNU compilers.)
+# input file.
ac_save_ext=$ac_ext
ac_ext=F
echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
@@ -4849,24 +5028,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -4875,13 +5045,14 @@
ac_compiler_gnu=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
ac_cv_f77_compiler_gnu=$ac_compiler_gnu
fi
echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
ac_ext=$ac_save_ext
+G77=`test $ac_compiler_gnu = yes && echo yes`
ac_test_FFLAGS=${FFLAGS+set}
ac_save_FFLAGS=$FFLAGS
FFLAGS=
@@ -4898,24 +5069,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_f77_g=yes
else
@@ -4924,7 +5086,7 @@
ac_cv_prog_f77_g=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -4932,20 +5094,18 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ if test "$G77" = yes; then
FFLAGS="-g -O2"
else
FFLAGS="-g"
fi
else
- if test "x$ac_cv_f77_compiler_gnu" = xyes; then
+ if test "$G77" = yes; then
FFLAGS="-O2"
else
FFLAGS=
fi
fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4992,12 +5152,6 @@
lt_cv_sys_max_cmd_len=8192;
;;
- amigaos*)
- # On AmigaOS with pdksh, this test takes hours, literally.
- # So we just punt and use a minimum line length of 8192.
- lt_cv_sys_max_cmd_len=8192;
- ;;
-
*)
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
@@ -5079,7 +5233,7 @@
symcode='[BCDEGQRST]'
;;
solaris* | sysv5*)
- symcode='[BDRT]'
+ symcode='[BDT]'
;;
sysv4)
symcode='[DFNSTU]'
@@ -5097,7 +5251,7 @@
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
- symcode='[ABCDGIRSTW]' ;;
+ symcode='[ABCDGISTW]' ;;
esac
# Try without a prefix undercore, then with it.
@@ -5276,6 +5430,9 @@
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# Sed substitution to undo escaping of the cmd sep variable
+unescape_variable_subst='s/\\\(${_S_}\)/\1/g'
+
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
@@ -5562,13 +5719,13 @@
if test -n "$RANLIB"; then
case $host_os in
openbsd*)
- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="\$RANLIB -t \$oldlib\${_S_}$old_postinstall_cmds"
;;
*)
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ old_postinstall_cmds="\$RANLIB \$oldlib\${_S_}$old_postinstall_cmds"
;;
esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ old_archive_cmds="$old_archive_cmds\${_S_}\$RANLIB \$oldlib"
fi
# Only perform the check for file, if the check method requires it
@@ -5823,8 +5980,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5842,11 +5998,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:5845: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6001: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:5849: \$? = $ac_status" >&5
+ echo "$as_me:6005: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -5989,12 +6145,12 @@
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
lt_prog_compiler_wl='-Wl,'
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-static'
;;
- ccc*)
+ ccc)
lt_prog_compiler_wl='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
@@ -6056,8 +6212,7 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6075,11 +6230,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6078: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6233: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6082: \$? = $ac_status" >&5
+ echo "$as_me:6237: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -6126,6 +6281,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -6135,11 +6297,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6138: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6300: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6142: \$? = $ac_status" >&5
+ echo "$as_me:6304: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -6149,11 +6311,8 @@
fi
fi
chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -6263,7 +6422,7 @@
;;
amigaos*)
- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
@@ -6305,14 +6464,14 @@
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
- fi~
+ fi${_S_}
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs=no
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -6350,31 +6509,6 @@
hardcode_shlibpath_var=no
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds="$tmp_archive_cmds"
- fi
- else
- ld_shlibs=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -6402,7 +6536,7 @@
aix3*)
allow_undefined_flag=unsupported
always_export_symbols=yes
- archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L=yes
@@ -6503,6 +6637,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6519,24 +6654,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -6549,8 +6675,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6563,6 +6688,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6579,24 +6705,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -6609,8 +6726,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6624,13 +6740,13 @@
whole_archive_flag_spec=' '
archive_cmds_need_lc=yes
# This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
amigaos*)
- archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
# see comment about different semantics on the GNU ld section
@@ -6653,7 +6769,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -6663,52 +6779,57 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[012])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ allow_undefined_flag='-flat_namespace -undefined suppress'
+ else
+ allow_undefined_flag='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ archive_cmds='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
whole_archive_flag_spec='-all_load $convenience'
link_all_deplibs=yes
- else
- ld_shlibs=no
fi
;;
@@ -6742,7 +6863,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
@@ -6751,9 +6872,9 @@
hpux9*)
if test "$GCC" = yes; then
- archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
hardcode_libdir_separator=:
@@ -6829,7 +6950,7 @@
link_all_deplibs=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -6873,7 +6994,7 @@
hardcode_libdir_flag_spec='-L$libdir'
hardcode_minus_L=yes
allow_undefined_flag=unsupported
- archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
@@ -6897,8 +7018,8 @@
else
allow_undefined_flag=' -expect_unresolved \*'
archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_}
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec='-rpath $libdir'
@@ -6918,12 +7039,12 @@
no_undefined_flag=' -z text'
if test "$GCC" = yes; then
archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
else
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
fi
hardcode_libdir_flag_spec='-R$libdir'
hardcode_shlibpath_var=no
@@ -7012,8 +7133,8 @@
# $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now
archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
hardcode_libdir_flag_spec=
hardcode_shlibpath_var=no
runpath_var='LD_RUN_PATH'
@@ -7050,7 +7171,7 @@
if test "$enable_shared" = yes && test "$GCC" = yes; then
case $archive_cmds in
- *'~'*)
+ *"$_S_"*)
# FIXME: we may have to deal with multi-command sequences.
;;
'$CC '*)
@@ -7102,6 +7223,72 @@
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action=
+if test -n "$hardcode_libdir_flag_spec" || \
+ test -n "$runpath_var " || \
+ test "X$hardcode_automatic"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
+ test "$hardcode_minus_L" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ NOT-darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -7195,7 +7382,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -7228,13 +7415,13 @@
yes,cygwin* | yes,mingw* | yes,pw32*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
+ postinstall_cmds='base_file=`basename \${file}`${_S_}
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
+ dldir=$destdir/`dirname \$dlpath`${_S_}
+ test -d \$dldir || mkdir -p \$dldir${_S_}
$install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
+ dlpath=$dir/\$dldll${_S_}
$rm \$dlpath'
shlibpath_overrides_runpath=yes
@@ -7242,7 +7429,7 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -7281,16 +7468,17 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -7308,18 +7496,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -7463,12 +7639,6 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -7478,18 +7648,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -7499,7 +7657,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -7515,7 +7673,7 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -7528,7 +7686,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -7646,72 +7804,6 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
- test -n "$runpath_var " || \
- test "X$hardcode_automatic"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
- test "$hardcode_minus_L" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -7747,6 +7839,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7770,24 +7863,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dl_dlopen=yes
else
@@ -7796,8 +7880,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -7821,28 +7904,21 @@
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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load (); 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 shl_load
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -7873,24 +7949,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_shl_load=yes
else
@@ -7899,8 +7966,7 @@
ac_cv_func_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -7915,6 +7981,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7938,24 +8005,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dld_shl_load=yes
else
@@ -7964,8 +8022,7 @@
ac_cv_lib_dld_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -7979,28 +8036,21 @@
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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen (); 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 dlopen
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -8031,24 +8081,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dlopen=yes
else
@@ -8057,8 +8098,7 @@
ac_cv_func_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -8073,6 +8113,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8096,24 +8137,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dl_dlopen=yes
else
@@ -8122,8 +8154,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8139,6 +8170,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8162,24 +8194,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_svld_dlopen=yes
else
@@ -8188,8 +8211,7 @@
ac_cv_lib_svld_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -8205,6 +8227,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -8228,24 +8251,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dld_dld_link=yes
else
@@ -8254,8 +8268,7 @@
ac_cv_lib_dld_dld_link=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -8310,7 +8323,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8313 "configure"
+#line 8326 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8408,7 +8421,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 8411 "configure"
+#line 8424 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -8528,7 +8541,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -8539,41 +8552,46 @@
fi
;;
darwin* | rhapsody*)
- if test "$GCC" = yes; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[012])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ allow_undefined_flag='-flat_namespace -undefined suppress'
+ else
+ allow_undefined_flag='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
- output_verbose_link_cmd='echo'
- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
+ output_verbose_link_cmd='echo'
+ archive_cmds='$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
+ module_cmds='$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct=no
hardcode_automatic=yes
hardcode_shlibpath_var=unsupported
whole_archive_flag_spec='-all_load $convenience'
link_all_deplibs=yes
- else
- ld_shlibs=no
- fi
+ fi
;;
esac
echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -8599,8 +8617,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -8658,7 +8675,7 @@
old_postinstall_cmds | old_postuninstall_cmds | \
sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
# Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\""
;;
*)
eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
@@ -8727,6 +8744,9 @@
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Set the command separator (default: ~)
+_S_=\${LIBTOOL_CMD_SEP-\~}
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -8778,7 +8798,7 @@
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -9051,10 +9071,7 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ test -f Makefile && make "$ltmain"
fi
@@ -9235,7 +9252,7 @@
# Accept absolute paths.
[\\/]* | ?:[\\/]*)
re_direlt='/[^/][^/]*/\.\./'
- # Canonicalize the pathname of ld
+ # Canonicalize the path of ld
ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -9304,7 +9321,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
+case `"$LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
lt_cv_prog_gnu_ld=yes
;;
@@ -9349,7 +9366,7 @@
# linker, instead of GNU ld. If possible, this setting should
# overridden to take advantage of the native linker features on
# the platform it is being used on.
- archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
fi
# Commands to make compiler produce verbose output that lists
@@ -9457,6 +9474,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9473,24 +9491,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -9503,8 +9512,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9518,6 +9526,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -9534,24 +9543,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -9564,8 +9564,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9579,7 +9578,7 @@
whole_archive_flag_spec_CXX=' '
archive_cmds_need_lc_CXX=yes
# This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
@@ -9609,7 +9608,7 @@
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
- fi~
+ fi${_S_}
$CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs_CXX=no
@@ -9617,54 +9616,55 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc_CXX=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag_CXX='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_CXX='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[012])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
+ else
+ allow_undefined_flag_CXX='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
- lt_int_apple_cc_single_mod=no
- output_verbose_link_cmd='echo'
- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
- lt_int_apple_cc_single_mod=yes
- fi
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- else
- archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
- fi
- module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ lt_int_apple_cc_single_mod=no
+ output_verbose_link_cmd='echo'
+ if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+ lt_int_apple_cc_single_mod=yes
+ fi
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_cmds_CXX='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+ archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ fi
+ module_cmds_CXX='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- else
- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
- fi
- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ fi
+ module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct_CXX=no
hardcode_automatic_CXX=yes
hardcode_shlibpath_var_CXX=unsupported
whole_archive_flag_spec_CXX='-all_load $convenience'
link_all_deplibs_CXX=yes
- else
- ld_shlibs_CXX=no
- fi
+ fi
;;
dgux*)
@@ -9691,7 +9691,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
@@ -9713,7 +9713,7 @@
ld_shlibs_CXX=no
;;
aCC)
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -9726,7 +9726,7 @@
;;
*)
if test "$GXX" = yes; then
- archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
@@ -9919,7 +9919,7 @@
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -10015,9 +10015,9 @@
cxx)
allow_undefined_flag_CXX=' -expect_unresolved \*'
archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
- archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
+ archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done${_S_}
+ echo "-hidden">> $lib.exp${_S_}
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib${_S_}
$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -10094,8 +10094,8 @@
# Sun C++ 4.2, 5.x and Centerline C++
no_undefined_flag_CXX=' -zdefs'
archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
hardcode_libdir_flag_spec_CXX='-R$libdir'
hardcode_shlibpath_var_CXX=no
@@ -10140,8 +10140,8 @@
no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
if $CC --version | grep -v '^2\.7' > /dev/null; then
archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -10151,8 +10151,8 @@
# g++ 2.7 appears to require `-G' NOT `-shared' on this
# platform.
archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
- archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+ archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -10398,7 +10398,7 @@
;;
esac
;;
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
@@ -10474,7 +10474,7 @@
;;
esac
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -10566,8 +10566,7 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10585,11 +10584,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10588: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10587: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:10592: \$? = $ac_status" >&5
+ echo "$as_me:10591: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -10636,6 +10635,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -10645,11 +10651,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:10648: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10654: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10652: \$? = $ac_status" >&5
+ echo "$as_me:10658: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10659,11 +10665,8 @@
fi
fi
chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -10739,7 +10742,7 @@
if test "$enable_shared" = yes && test "$GCC" = yes; then
case $archive_cmds_CXX in
- *'~'*)
+ *"$_S_"*)
# FIXME: we may have to deal with multi-command sequences.
;;
'$CC '*)
@@ -10791,6 +10794,72 @@
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_CXX=
+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+ test -n "$runpath_var CXX" || \
+ test "X$hardcode_automatic_CXX"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_CXX" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
+ test "$hardcode_minus_L_CXX" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_CXX=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_CXX=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_CXX=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6
+
+if test "$hardcode_action_CXX" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ NOT-darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -10884,7 +10953,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -10917,13 +10986,13 @@
yes,cygwin* | yes,mingw* | yes,pw32*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
+ postinstall_cmds='base_file=`basename \${file}`${_S_}
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
+ dldir=$destdir/`dirname \$dlpath`${_S_}
+ test -d \$dldir || mkdir -p \$dldir${_S_}
$install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
+ dlpath=$dir/\$dldll${_S_}
$rm \$dlpath'
shlibpath_overrides_runpath=yes
@@ -10931,7 +11000,7 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -10970,16 +11039,17 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -10997,18 +11067,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -11152,12 +11210,6 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -11167,18 +11219,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -11188,7 +11228,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -11204,7 +11244,7 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -11217,7 +11257,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -11335,72 +11375,6 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
- test -n "$runpath_var CXX" || \
- test "X$hardcode_automatic_CXX"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_CXX" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
- test "$hardcode_minus_L_CXX" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_CXX=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_CXX=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -11436,6 +11410,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -11459,24 +11434,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dl_dlopen=yes
else
@@ -11485,8 +11451,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -11510,28 +11475,21 @@
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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load (); 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 shl_load
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -11562,24 +11520,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_shl_load=yes
else
@@ -11588,8 +11537,7 @@
ac_cv_func_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -11604,6 +11552,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -11627,24 +11576,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dld_shl_load=yes
else
@@ -11653,8 +11593,7 @@
ac_cv_lib_dld_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -11668,28 +11607,21 @@
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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen (); 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 dlopen
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -11720,24 +11652,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dlopen=yes
else
@@ -11746,8 +11669,7 @@
ac_cv_func_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -11762,6 +11684,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -11785,24 +11708,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dl_dlopen=yes
else
@@ -11811,8 +11725,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -11828,6 +11741,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -11851,24 +11765,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_svld_dlopen=yes
else
@@ -11877,8 +11782,7 @@
ac_cv_lib_svld_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -11894,6 +11798,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -11917,24 +11822,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dld_dld_link=yes
else
@@ -11943,8 +11839,7 @@
ac_cv_lib_dld_dld_link=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -11999,7 +11894,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12002 "configure"
+#line 11897 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12097,7 +11992,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12100 "configure"
+#line 11995 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12214,8 +12109,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -12273,7 +12167,7 @@
old_postinstall_cmds | old_postuninstall_cmds | \
sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
# Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\""
;;
*)
eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
@@ -12294,6 +12188,9 @@
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Set the command separator (default: ~)
+_S_=\${LIBTOOL_CMD_SEP-\~}
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -12345,7 +12242,7 @@
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -12593,10 +12490,7 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ test -f Makefile && make "$ltmain"
fi
@@ -12694,7 +12588,7 @@
aix3*)
test "$enable_shared" = yes && enable_static=no
if test -n "$RANLIB"; then
- archive_cmds="$archive_cmds~\$RANLIB \$lib"
+ archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -12838,12 +12732,12 @@
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
lt_prog_compiler_wl_F77='-Wl,'
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-static'
;;
- ccc*)
+ ccc)
lt_prog_compiler_wl_F77='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
@@ -12905,8 +12799,7 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12924,11 +12817,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12927: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12820: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12931: \$? = $ac_status" >&5
+ echo "$as_me:12824: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12975,6 +12868,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -12984,11 +12884,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12987: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12887: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12991: \$? = $ac_status" >&5
+ echo "$as_me:12891: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12998,11 +12898,8 @@
fi
fi
chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -13112,7 +13009,7 @@
;;
amigaos*)
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
@@ -13154,14 +13051,14 @@
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
- fi~
+ fi${_S_}
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs=no
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -13199,31 +13096,6 @@
hardcode_shlibpath_var_F77=no
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds_F77="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds_F77="$tmp_archive_cmds"
- fi
- else
- ld_shlibs_F77=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -13251,7 +13123,7 @@
aix3*)
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=yes
- archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_F77=yes
@@ -13358,24 +13230,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -13388,8 +13251,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -13408,24 +13270,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -13438,8 +13291,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -13453,13 +13305,13 @@
whole_archive_flag_spec_F77=' '
archive_cmds_need_lc_F77=yes
# This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
amigaos*)
- archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
# see comment about different semantics on the GNU ld section
@@ -13482,7 +13334,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -13492,52 +13344,57 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc_F77=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag_F77='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_F77='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_F77='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[012])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ allow_undefined_flag_F77='-flat_namespace -undefined suppress'
+ else
+ allow_undefined_flag_F77='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ archive_cmds_F77='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds_F77='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct_F77=no
hardcode_automatic_F77=yes
hardcode_shlibpath_var_F77=unsupported
whole_archive_flag_spec_F77='-all_load $convenience'
link_all_deplibs_F77=yes
- else
- ld_shlibs_F77=no
fi
;;
@@ -13571,7 +13428,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
@@ -13580,9 +13437,9 @@
hpux9*)
if test "$GCC" = yes; then
- archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_F77='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_F77='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_F77=:
@@ -13658,7 +13515,7 @@
link_all_deplibs_F77=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -13702,7 +13559,7 @@
hardcode_libdir_flag_spec_F77='-L$libdir'
hardcode_minus_L_F77=yes
allow_undefined_flag_F77=unsupported
- archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
@@ -13726,8 +13583,8 @@
else
allow_undefined_flag_F77=' -expect_unresolved \*'
archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_}
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_F77='-rpath $libdir'
@@ -13747,12 +13604,12 @@
no_undefined_flag_F77=' -z text'
if test "$GCC" = yes; then
archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
else
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
fi
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_shlibpath_var_F77=no
@@ -13841,8 +13698,8 @@
# $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now
archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
hardcode_libdir_flag_spec_F77=
hardcode_shlibpath_var_F77=no
runpath_var='LD_RUN_PATH'
@@ -13879,7 +13736,7 @@
if test "$enable_shared" = yes && test "$GCC" = yes; then
case $archive_cmds_F77 in
- *'~'*)
+ *"$_S_"*)
# FIXME: we may have to deal with multi-command sequences.
;;
'$CC '*)
@@ -13931,6 +13788,72 @@
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_F77=
+if test -n "$hardcode_libdir_flag_spec_F77" || \
+ test -n "$runpath_var F77" || \
+ test "X$hardcode_automatic_F77"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_F77" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
+ test "$hardcode_minus_L_F77" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_F77=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_F77=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_F77=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6
+
+if test "$hardcode_action_F77" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ NOT-darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -14024,7 +13947,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -14057,13 +13980,13 @@
yes,cygwin* | yes,mingw* | yes,pw32*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
+ postinstall_cmds='base_file=`basename \${file}`${_S_}
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
+ dldir=$destdir/`dirname \$dlpath`${_S_}
+ test -d \$dldir || mkdir -p \$dldir${_S_}
$install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
+ dlpath=$dir/\$dldll${_S_}
$rm \$dlpath'
shlibpath_overrides_runpath=yes
@@ -14071,7 +13994,7 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -14110,16 +14033,17 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -14137,18 +14061,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -14292,12 +14204,6 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -14307,18 +14213,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -14328,7 +14222,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -14344,7 +14238,7 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -14357,7 +14251,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -14475,74 +14369,7 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
- test -n "$runpath_var F77" || \
- test "X$hardcode_automatic_F77"="Xyes" ; then
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_F77" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
- test "$hardcode_minus_L_F77" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_F77=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_F77=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
-
-
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
# with your package, and you will get complaints that there are
@@ -14556,8 +14383,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -14615,7 +14441,7 @@
old_postinstall_cmds | old_postuninstall_cmds | \
sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
# Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\""
;;
*)
eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
@@ -14636,6 +14462,9 @@
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Set the command separator (default: ~)
+_S_=\${LIBTOOL_CMD_SEP-\~}
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -14687,7 +14516,7 @@
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -14935,10 +14764,7 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ test -f Makefile && make "$ltmain"
fi
@@ -14997,8 +14823,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15016,11 +14841,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15019: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14844: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15023: \$? = $ac_status" >&5
+ echo "$as_me:14848: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15163,12 +14988,12 @@
linux*)
case $CC in
- icc* | ecc*)
+ icc|ecc)
lt_prog_compiler_wl_GCJ='-Wl,'
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-static'
;;
- ccc*)
+ ccc)
lt_prog_compiler_wl_GCJ='-Wl,'
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
@@ -15230,8 +15055,7 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15249,11 +15073,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15252: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15076: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15256: \$? = $ac_status" >&5
+ echo "$as_me:15080: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -15300,6 +15124,13 @@
mkdir out
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+ # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+ # that will create temporary files in the current directory regardless of
+ # the output directory. Thus, making CWD read-only will cause this test
+ # to fail, enabling locking or at least warning the user not to do parallel
+ # builds.
+ chmod -w .
+
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
@@ -15309,11 +15140,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15312: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15143: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15316: \$? = $ac_status" >&5
+ echo "$as_me:15147: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15323,11 +15154,8 @@
fi
fi
chmod u+w .
- $rm conftest*
- # SGI C++ compiler will create directory out/ii_files/ for
- # template instantiation
- test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
- $rm out/* && rmdir out
+ $rm conftest* out/*
+ rmdir out
cd ..
rmdir conftest
$rm conftest*
@@ -15437,7 +15265,7 @@
;;
amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
@@ -15479,14 +15307,14 @@
else
echo EXPORTS > $output_objdir/$soname.def;
cat $export_symbols >> $output_objdir/$soname.def;
- fi~
+ fi${_S_}
$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
else
ld_shlibs=no
fi
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -15524,31 +15352,6 @@
hardcode_shlibpath_var_GCJ=no
;;
- linux*)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
- tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- archive_cmds_GCJ="$tmp_archive_cmds"
- supports_anon_versioning=no
- case `$LD -v 2>/dev/null` in
- *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
- *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
- *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
- *\ 2.11.*) ;; # other 2.11 versions
- *) supports_anon_versioning=yes ;;
- esac
- if test $supports_anon_versioning = yes; then
- archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- else
- archive_expsym_cmds_GCJ="$tmp_archive_cmds"
- fi
- else
- ld_shlibs_GCJ=no
- fi
- ;;
-
*)
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
@@ -15576,7 +15379,7 @@
aix3*)
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=yes
- archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+ archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
hardcode_minus_L_GCJ=yes
@@ -15677,6 +15480,7 @@
allow_undefined_flag_GCJ='-berok'
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -15693,24 +15497,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -15723,8 +15518,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15737,6 +15531,7 @@
else
# Determine the default libpath from the value encoded in an empty executable.
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -15753,24 +15548,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
@@ -15783,8 +15569,7 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15798,13 +15583,13 @@
whole_archive_flag_spec_GCJ=' '
archive_cmds_need_lc_GCJ=yes
# This is similar to how AIX traditionally builds it's shared libraries.
- archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
fi
fi
;;
amigaos*)
- archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+ archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
# see comment about different semantics on the GNU ld section
@@ -15827,7 +15612,7 @@
# Tell ltmain to make .dll files, not .so files.
shrext=".dll"
# FIXME: Setting linknames here is a bad hack.
- archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -15837,52 +15622,57 @@
;;
darwin* | rhapsody*)
- if test "$GXX" = yes ; then
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
archive_cmds_need_lc_GCJ=no
case "$host_os" in
rhapsody* | darwin1.[012])
allow_undefined_flag_GCJ='-undefined suppress'
;;
- *) # Darwin 1.3 on
- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- else
- case ${MACOSX_DEPLOYMENT_TARGET} in
- 10.[012])
- allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
- ;;
- 10.*)
- allow_undefined_flag_GCJ='-undefined dynamic_lookup'
- ;;
- esac
- fi
+ darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
;;
+ *) # Darwin 7.0 on
+ case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
+ 10.[012])
+ test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+ ;;
+ *) # 10.3 on
+ if test -z ${LD_TWOLEVEL_NAMESPACE}; then
+ allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
+ else
+ allow_undefined_flag_GCJ='-undefined dynamic_lookup'
+ fi
+ ;;
+ esac
+ ;;
esac
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes. Also zsh mangles
+ # `"' quotes if we put them in here... so don't!
lt_int_apple_cc_single_mod=no
output_verbose_link_cmd='echo'
if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
lt_int_apple_cc_single_mod=yes
fi
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ archive_cmds_GCJ='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
else
- archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
fi
- module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+ module_cmds_GCJ='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
# Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
else
- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
fi
- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
hardcode_direct_GCJ=no
hardcode_automatic_GCJ=yes
hardcode_shlibpath_var_GCJ=unsupported
whole_archive_flag_spec_GCJ='-all_load $convenience'
link_all_deplibs_GCJ=yes
- else
- ld_shlibs_GCJ=no
fi
;;
@@ -15916,7 +15706,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | kfreebsd*-gnu)
+ freebsd*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
@@ -15925,9 +15715,9 @@
hpux9*)
if test "$GCC" = yes; then
- archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
else
- archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
fi
hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
hardcode_libdir_separator_GCJ=:
@@ -16003,7 +15793,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd* | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -16047,7 +15837,7 @@
hardcode_libdir_flag_spec_GCJ='-L$libdir'
hardcode_minus_L_GCJ=yes
allow_undefined_flag_GCJ=unsupported
- archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
;;
@@ -16071,8 +15861,8 @@
else
allow_undefined_flag_GCJ=' -expect_unresolved \*'
archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
- archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_}
+ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib${_S_}$rm $lib.exp'
# Both c and cxx compiler support -rpath directly
hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
@@ -16092,12 +15882,12 @@
no_undefined_flag_GCJ=' -z text'
if test "$GCC" = yes; then
archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
else
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
fi
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_shlibpath_var_GCJ=no
@@ -16186,8 +15976,8 @@
# $CC -shared without GNU ld will not create a library from C++
# object files and a static libstdc++, better avoid it by now
archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
- archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+ archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
hardcode_libdir_flag_spec_GCJ=
hardcode_shlibpath_var_GCJ=no
runpath_var='LD_RUN_PATH'
@@ -16224,7 +16014,7 @@
if test "$enable_shared" = yes && test "$GCC" = yes; then
case $archive_cmds_GCJ in
- *'~'*)
+ *"$_S_"*)
# FIXME: we may have to deal with multi-command sequences.
;;
'$CC '*)
@@ -16276,6 +16066,72 @@
;;
esac
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+hardcode_action_GCJ=
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+ test -n "$runpath_var GCJ" || \
+ test "X$hardcode_automatic_GCJ"="Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$hardcode_direct_GCJ" != no &&
+ # If the only mechanism to avoid hardcoding is shlibpath_var, we
+ # have to relink, otherwise we might link with an installed library
+ # when we should be linking with a yet-to-be-installed one
+ ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
+ test "$hardcode_minus_L_GCJ" != no; then
+ # Linking always hardcodes the temporary library directory.
+ hardcode_action_GCJ=relink
+ else
+ # We can link without hardcoding, and we can hardcode nonexisting dirs.
+ hardcode_action_GCJ=immediate
+ fi
+else
+ # We cannot hardcode anything, or else we can only hardcode existing
+ # directories.
+ hardcode_action_GCJ=unsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
+
+if test "$hardcode_action_GCJ" = relink; then
+ # Fast installation is not supported
+ enable_fast_install=no
+elif test "$shlibpath_overrides_runpath" = yes ||
+ test "$enable_shared" = no; then
+ # Fast installation is not necessary
+ enable_fast_install=needless
+fi
+
+striplib=
+old_striplib=
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+ test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+ case $host_os in
+ NOT-darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+ ;;
+ *)
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ ;;
+ esac
+fi
+
echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
library_names_spec=
@@ -16369,7 +16225,7 @@
amigaos*)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
beos*)
@@ -16402,13 +16258,13 @@
yes,cygwin* | yes,mingw* | yes,pw32*)
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
- dldir=$destdir/`dirname \$dlpath`~
- test -d \$dldir || mkdir -p \$dldir~
+ postinstall_cmds='base_file=`basename \${file}`${_S_}
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
+ dldir=$destdir/`dirname \$dlpath`${_S_}
+ test -d \$dldir || mkdir -p \$dldir${_S_}
$install_prog $dir/$dlname \$dldir/$dlname'
- postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
- dlpath=$dir/\$dldll~
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
+ dlpath=$dir/\$dldll${_S_}
$rm \$dlpath'
shlibpath_overrides_runpath=yes
@@ -16416,7 +16272,7 @@
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
- sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+ sys_lib_search_path_spec="/lib /lib/w32api /usr/lib /usr/local/lib"
;;
mingw*)
# MinGW DLLs use traditional 'lib' prefix
@@ -16455,16 +16311,17 @@
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
+ # FIXME: Relying on posixy $() will cause problems for
+ # cross-compilation, but unfortunately the echo tests do not
+ # yet detect zsh echo's removal of \ escapes.
+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
soname_spec='${libname}${release}${major}$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext='$(test .$module = .yes && echo .so || echo .dylib)'
# Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
- if test "$GCC" = yes; then
- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
- else
- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+ if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+ sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
fi
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
@@ -16482,18 +16339,6 @@
dynamic_linker=no
;;
-kfreebsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
freebsd*)
objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
version_type=freebsd-$objformat
@@ -16637,12 +16482,6 @@
# before this can be enabled.
hardcode_into_libs=yes
- # Append ld.so.conf contents to the search path
- if test -f /etc/ld.so.conf; then
- ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf`
- sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
- fi
-
# We used to test for /lib/ld.so.1 and disable shared libraries on
# powerpc, because MkLinux only supported shared libraries with the
# GNU dynamic linker. Since this was broken with cross compilers,
@@ -16652,18 +16491,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-knetbsd*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='GNU ld.so'
- ;;
-
netbsd*)
version_type=sunos
need_lib_prefix=no
@@ -16673,7 +16500,7 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
soname_spec='${libname}${release}${shared_ext}$major'
dynamic_linker='NetBSD ld.elf_so'
fi
@@ -16689,7 +16516,7 @@
shlibpath_overrides_runpath=yes
;;
-nto-qnx*)
+nto-qnx)
version_type=linux
need_lib_prefix=no
need_version=no
@@ -16702,7 +16529,7 @@
openbsd*)
version_type=sunos
need_lib_prefix=no
- need_version=yes
+ need_version=no
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH
@@ -16820,72 +16647,6 @@
echo "${ECHO_T}$dynamic_linker" >&6
test "$dynamic_linker" = no && can_build_shared=no
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
- test -n "$runpath_var GCJ" || \
- test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
- # We can hardcode non-existant directories.
- if test "$hardcode_direct_GCJ" != no &&
- # If the only mechanism to avoid hardcoding is shlibpath_var, we
- # have to relink, otherwise we might link with an installed library
- # when we should be linking with a yet-to-be-installed one
- ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
- test "$hardcode_minus_L_GCJ" != no; then
- # Linking always hardcodes the temporary library directory.
- hardcode_action_GCJ=relink
- else
- # We can link without hardcoding, and we can hardcode nonexisting dirs.
- hardcode_action_GCJ=immediate
- fi
-else
- # We cannot hardcode anything, or else we can only hardcode existing
- # directories.
- hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
- # Fast installation is not supported
- enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
- # Fast installation is not necessary
- enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP" ; then
- striplib="$STRIP -x"
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
- ;;
- *)
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- ;;
- esac
-fi
-
if test "x$enable_dlopen" != xyes; then
enable_dlopen=unknown
enable_dlopen_self=unknown
@@ -16921,6 +16682,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -16944,24 +16706,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dl_dlopen=yes
else
@@ -16970,8 +16723,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -16995,28 +16747,21 @@
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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define shl_load innocuous_shl_load
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shl_load (); 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 shl_load
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -17047,24 +16792,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_shl_load=yes
else
@@ -17073,8 +16809,7 @@
ac_cv_func_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -17089,6 +16824,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17112,24 +16848,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dld_shl_load=yes
else
@@ -17138,8 +16865,7 @@
ac_cv_lib_dld_shl_load=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -17153,28 +16879,21 @@
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 dlopen to an innocuous variant, in case <limits.h> declares dlopen.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define dlopen innocuous_dlopen
-
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen (); 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 dlopen
-
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -17205,24 +16924,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dlopen=yes
else
@@ -17231,8 +16941,7 @@
ac_cv_func_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -17247,6 +16956,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17270,24 +16980,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dl_dlopen=yes
else
@@ -17296,8 +16997,7 @@
ac_cv_lib_dl_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -17313,6 +17013,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lsvld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17336,24 +17037,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_svld_dlopen=yes
else
@@ -17362,8 +17054,7 @@
ac_cv_lib_svld_dlopen=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -17379,6 +17070,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldld $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17402,24 +17094,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_dld_dld_link=yes
else
@@ -17428,8 +17111,7 @@
ac_cv_lib_dld_dld_link=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -17484,7 +17166,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17487 "configure"
+#line 17169 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17582,7 +17264,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 17585 "configure"
+#line 17267 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17699,8 +17381,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -17758,7 +17439,7 @@
old_postinstall_cmds | old_postuninstall_cmds | \
sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
# Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\""
;;
*)
eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
@@ -17779,6 +17460,9 @@
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Set the command separator (default: ~)
+_S_=\${LIBTOOL_CMD_SEP-\~}
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -17830,7 +17514,7 @@
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -18078,10 +17762,7 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ test -f Makefile && make "$ltmain"
fi
@@ -18144,8 +17825,7 @@
# Now quote all the things that may contain metacharacters while being
# careful not to overquote the AC_SUBSTed values. We take copies of the
# variables and quote the copies for generation of the libtool script.
- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
- SED SHELL STRIP \
+ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
libname_spec library_names_spec soname_spec extract_expsyms_cmds \
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
deplibs_check_method reload_flag reload_cmds need_locks \
@@ -18203,7 +17883,7 @@
old_postinstall_cmds | old_postuninstall_cmds | \
sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
# Double-quote double-evaled strings.
- eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+ eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\" -e \"\$unescape_variable_subst\"\`\\\""
;;
*)
eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
@@ -18224,6 +17904,9 @@
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+# Set the command separator (default: ~)
+_S_=\${LIBTOOL_CMD_SEP-\~}
+
# Shell to use when invoking shell scripts.
SHELL=$lt_SHELL
@@ -18275,7 +17958,7 @@
NM=$lt_NM
# A symbol stripping program
-STRIP=$lt_STRIP
+STRIP=$STRIP
# Used to examine libraries when file_magic_cmd begins "file"
MAGIC_CMD=$MAGIC_CMD
@@ -18523,10 +18206,7 @@
# If there is no Makefile yet, we rely on a make rule to execute
# `config.status --recheck' to rerun these tests and create the
# libtool script then.
- ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
- if test -f "$ltmain_in"; then
- test -f Makefile && make "$ltmain"
- fi
+ test -f Makefile && make "$ltmain"
fi
@@ -18607,7 +18287,6 @@
# 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
@@ -18624,7 +18303,6 @@
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.
@@ -18632,20 +18310,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
;;
@@ -18677,7 +18355,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
@@ -18711,6 +18389,7 @@
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
@@ -18773,24 +18452,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_const=yes
else
@@ -18799,7 +18469,7 @@
ac_cv_c_const=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
@@ -18818,6 +18488,7 @@
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
@@ -18839,27 +18510,19 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -18881,24 +18544,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -18907,7 +18561,7 @@
ac_cv_c_bigendian=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -18917,6 +18571,7 @@
# 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
@@ -18938,24 +18593,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -18973,9 +18619,10 @@
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
else
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19014,10 +18661,10 @@
( exit $ac_status )
ac_cv_c_bigendian=yes
fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f 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
@@ -19085,6 +18732,7 @@
HAVE_DOXYGEN_TRUE='#'
HAVE_DOXYGEN_FALSE=
fi
+
if test $HAVE_DOXYGEN = "false"; then
{ echo "$as_me:$LINENO: WARNING: *** doxygen not found, docs will not be built" >&5
echo "$as_me: WARNING: *** doxygen not found, docs will not be built" >&2;}
@@ -19135,6 +18783,16 @@
fi
+if test "x${ac_enable_decode}" = "xyes"; then
+ FS_DECODE_TRUE=
+ FS_DECODE_FALSE='#'
+else
+ FS_DECODE_TRUE='#'
+ FS_DECODE_FALSE=
+fi
+
+
+
ac_enable_encode=yes
# Check whether --enable-encode or --disable-encode was given.
if test "${enable_encode+set}" = set; then
@@ -19158,6 +18816,16 @@
fi
+
+if test "x${ac_enable_encode}" = "xyes"; then
+ FS_ENCODE_TRUE=
+ FS_ENCODE_FALSE='#'
+else
+ FS_ENCODE_TRUE='#'
+ FS_ENCODE_FALSE=
+fi
+
+
if test "x${ac_enable_decode}" = xno && test "x${ac_enable_encode}" = xno ; then
{ { echo "$as_me:$LINENO: error:
***
@@ -19207,6 +18875,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lvorbis -lm -logg $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19230,24 +18899,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_vorbis_vorbis_info_init=yes
else
@@ -19256,8 +18916,7 @@
ac_cv_lib_vorbis_vorbis_info_init=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_vorbis_vorbis_info_init" >&5
@@ -19280,6 +18939,7 @@
echo "$as_me:$LINENO: checking vorbis/codec.h usability" >&5
echo $ECHO_N "checking vorbis/codec.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19290,24 +18950,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -19316,7 +18967,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -19324,6 +18975,7 @@
echo "$as_me:$LINENO: checking vorbis/codec.h presence" >&5
echo $ECHO_N "checking vorbis/codec.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19341,7 +18993,6 @@
(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
@@ -19361,32 +19012,33 @@
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: vorbis/codec.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: vorbis/codec.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+ { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
;;
- no:yes:* )
+ no:yes )
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: vorbis/codec.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: vorbis/codec.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: vorbis/codec.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: vorbis/codec.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: vorbis/codec.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: vorbis/codec.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -19434,6 +19086,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lvorbisenc -lm -logg -lvorbis $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19457,24 +19110,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_vorbisenc_vorbis_encode_init=yes
else
@@ -19483,8 +19127,7 @@
ac_cv_lib_vorbisenc_vorbis_encode_init=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_vorbisenc_vorbis_encode_init" >&5
@@ -19507,6 +19150,7 @@
echo "$as_me:$LINENO: checking vorbis/vorbisenc.h usability" >&5
echo $ECHO_N "checking vorbis/vorbisenc.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19517,24 +19161,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -19543,7 +19178,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -19551,6 +19186,7 @@
echo "$as_me:$LINENO: checking vorbis/vorbisenc.h presence" >&5
echo $ECHO_N "checking vorbis/vorbisenc.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19568,7 +19204,6 @@
(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
@@ -19588,32 +19223,33 @@
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
{ echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: vorbis/vorbisenc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: vorbis/vorbisenc.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+ { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: vorbis/vorbisenc.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
;;
- no:yes:* )
+ no:yes )
{ echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: vorbis/vorbisenc.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: vorbis/vorbisenc.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: vorbis/vorbisenc.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: vorbis/vorbisenc.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: vorbis/vorbisenc.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: vorbis/vorbisenc.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: vorbis/vorbisenc.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: vorbis/vorbisenc.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -19676,6 +19312,7 @@
fi
+
if test "x$HAVE_VORBISENC" = "xyes"; then
HAVE_VORBISENC_TRUE=
HAVE_VORBISENC_FALSE='#'
@@ -19685,7 +19322,10 @@
fi
+
HAVE_SPEEX=no
+HAVE_SPEEX_1_1=no
+SPEEX_SUPPORT=no
ac_enable_speex=yes
# Check whether --enable-speex or --disable-speex was given.
@@ -19705,6 +19345,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-lspeex -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19728,24 +19369,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_speex_speex_encoder_init=yes
else
@@ -19754,8 +19386,7 @@
ac_cv_lib_speex_speex_encoder_init=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_encoder_init" >&5
@@ -19778,6 +19409,7 @@
echo "$as_me:$LINENO: checking speex.h usability" >&5
echo $ECHO_N "checking speex.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19788,24 +19420,15 @@
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>conftest.er1
+ (eval $ac_compile) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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
@@ -19814,7 +19437,7 @@
ac_header_compiler=no
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -19822,6 +19445,7 @@
echo "$as_me:$LINENO: checking speex.h presence" >&5
echo $ECHO_N "checking speex.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -19839,7 +19463,6 @@
(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
@@ -19859,32 +19482,33 @@
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
{ echo "$as_me:$LINENO: WARNING: speex.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: speex.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: speex.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: speex.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
+ { echo "$as_me:$LINENO: WARNING: speex.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: speex.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
;;
- no:yes:* )
+ no:yes )
{ echo "$as_me:$LINENO: WARNING: speex.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: speex.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: speex.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: speex.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: speex.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: speex.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: speex.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: speex.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: speex.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: speex.h: check for missing prerequisite headers?" >&2;}
{ echo "$as_me:$LINENO: WARNING: speex.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: speex.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: speex.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: speex.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -19911,7 +19535,215 @@
fi
if test "x$HAVE_SPEEX" = xyes ; then
+ echo "$as_me:$LINENO: checking for speex_preprocess in -lspeex" >&5
+echo $ECHO_N "checking for speex_preprocess in -lspeex... $ECHO_C" >&6
+if test "${ac_cv_lib_speex_speex_preprocess+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lspeex -lm $LIBS"
+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. */
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char speex_preprocess ();
+int
+main ()
+{
+speex_preprocess ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 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_speex_speex_preprocess=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_speex_speex_preprocess=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_speex_speex_preprocess" >&5
+echo "${ECHO_T}$ac_cv_lib_speex_speex_preprocess" >&6
+if test $ac_cv_lib_speex_speex_preprocess = yes; then
+ HAVE_SPEEX_1_1="maybe"
+fi
+
+ if test "x$HAVE_SPEEX_1_1" = xmaybe; then
+ if test "${ac_cv_header_speex_preprocess_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for speex_preprocess.h" >&5
+echo $ECHO_N "checking for speex_preprocess.h... $ECHO_C" >&6
+if test "${ac_cv_header_speex_preprocess_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_speex_preprocess_h" >&5
+echo "${ECHO_T}$ac_cv_header_speex_preprocess_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking speex_preprocess.h usability" >&5
+echo $ECHO_N "checking speex_preprocess.h usability... $ECHO_C" >&6
+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_includes_default
+#include <speex_preprocess.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 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
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking speex_preprocess.h presence" >&5
+echo $ECHO_N "checking speex_preprocess.h presence... $ECHO_C" >&6
+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. */
+#include <speex_preprocess.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 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); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc in
+ yes:no )
+ { echo "$as_me:$LINENO: WARNING: speex_preprocess.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: speex_preprocess.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: speex_preprocess.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: speex_preprocess.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+ no:yes )
+ { echo "$as_me:$LINENO: WARNING: speex_preprocess.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: speex_preprocess.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: speex_preprocess.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: speex_preprocess.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: speex_preprocess.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: speex_preprocess.h: proceeding with the preprocessor's result" >&2;}
+ (
+ cat <<\_ASBOX
+## ------------------------------------ ##
+## Report this to bug-autoconf at gnu.org. ##
+## ------------------------------------ ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for speex_preprocess.h" >&5
+echo $ECHO_N "checking for speex_preprocess.h... $ECHO_C" >&6
+if test "${ac_cv_header_speex_preprocess_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_speex_preprocess_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_speex_preprocess_h" >&5
+echo "${ECHO_T}$ac_cv_header_speex_preprocess_h" >&6
+
+fi
+if test $ac_cv_header_speex_preprocess_h = yes; then
+ HAVE_SPEEX_1_1="yes"
+else
+ HAVE_SPEEX_1_1="no"
+fi
+
+
+ fi
+ if test "x$HAVE_SPEEX_1_1" = xyes ; then
+
cat >>confdefs.h <<\_ACEOF
+#define HAVE_SPEEX_1_1 1
+_ACEOF
+
+ SPEEX_SUPPORT="yes (1.1.x)"
+ else
+ SPEEX_SUPPORT="yes (1.0.x)"
+ fi
+
+
+cat >>confdefs.h <<\_ACEOF
#define HAVE_SPEEX 1
_ACEOF
@@ -19925,7 +19757,7 @@
fi
else
- HAVE_SPEEX=disabled
+ SPEEX_SUPPORT=disabled
fi
@@ -19937,6 +19769,7 @@
HAVE_SPEEX_FALSE=
fi
+
if test "x${ac_enable_vorbis}" = xno && test "x${ac_enable_speex}" = xno ; then
{ { echo "$as_me:$LINENO: error:
***
@@ -20082,6 +19915,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-loggz $LIBS"
cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -20105,24 +19939,15 @@
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
+ (eval $ac_link) 2>&5
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 -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { 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); }; } &&
- { 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_oggz_oggz_open=yes
else
@@ -20131,8 +19956,7 @@
ac_cv_lib_oggz_oggz_open=no
fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_oggz_oggz_open" >&5
@@ -20189,6 +20013,7 @@
+
succeeded=no
if test -z "$PKG_CONFIG"; then
@@ -20306,6 +20131,7 @@
+
if test $fishsound_config_ok = no ; then
echo "$as_me:$LINENO: result:
@@ -20399,17 +20225,17 @@
if test "x$HAVE_OGGZ" = xyes ; then
- fishsound_examples="identify"
+ fishsound_examples="fishsound-identify"
if test "x$HAVE_LIBSNDFILE1" = xyes ; then
if test "x${ac_enable_decode}" = xyes ; then
- fishsound_examples="$fishsound_examples decode"
+ fishsound_examples="$fishsound_examples fishsound-decode"
fi
if test "x${ac_enable_encode}" = xyes ; then
- fishsound_examples="$fishsound_examples encode"
+ fishsound_examples="$fishsound_examples fishsound-encode"
fi
else
- fishsound_examples="$fishsound_examples (decode and encode require libsndfile)"
+ fishsound_examples="$fishsound_examples (fishsound-decode and fishsound-encode require libsndfile)"
fi
else
fishsound_examples="(none; liboggz and libsndfile required)"
@@ -20444,13 +20270,13 @@
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
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"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
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;
} |
@@ -20480,13 +20306,13 @@
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
s/:*\$(srcdir):*/:/;
s/:*\${srcdir}:*/:/;
s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
+s/^\([^=]*=[ ]*\):*/\1/;
s/:*$//;
-s/^[^=]*=[ ]*$//;
+s/^[^=]*=[ ]*$//;
}'
fi
@@ -20497,7 +20323,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
# 2. Add them.
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
@@ -20507,6 +20333,69 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_DOXYGEN\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FS_DECODE_TRUE}" && test -z "${FS_DECODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FS_DECODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FS_DECODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${FS_ENCODE_TRUE}" && test -z "${FS_ENCODE_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"FS_ENCODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"FS_ENCODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_VORBIS_TRUE}" && test -z "${HAVE_VORBIS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBIS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_VORBIS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_VORBISENC_TRUE}" && test -z "${HAVE_VORBISENC_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_VORBISENC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_VORBISENC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_SPEEX_TRUE}" && test -z "${HAVE_SPEEX_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_SPEEX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_SPEEX\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_OGGZ_TRUE}" && test -z "${HAVE_OGGZ_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_OGGZ\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_OGGZ\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${HAVE_LIBSNDFILE1_TRUE}" && test -z "${HAVE_LIBSNDFILE1_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_LIBSNDFILE1\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_LIBSNDFILE1\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -20541,10 +20430,9 @@
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 ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -20563,7 +20451,7 @@
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -20742,17 +20630,16 @@
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="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_cpp="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="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
# IFS
@@ -20779,7 +20666,7 @@
cat >&5 <<_CSEOF
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
+generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -20823,9 +20710,9 @@
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -20842,10 +20729,11 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
config.status
-configured by $0, generated by GNU Autoconf 2.59,
+configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
srcdir=$srcdir
@@ -20940,8 +20828,8 @@
# INIT-COMMANDS section.
#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
_ACEOF
@@ -20962,7 +20850,7 @@
"src/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/tests/Makefile" ;;
"src/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/examples/Makefile" ;;
"fishsound.pc" ) CONFIG_FILES="$CONFIG_FILES fishsound.pc" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -21071,6 +20959,12 @@
s, at AUTOMAKE@,$AUTOMAKE,;t t
s, at AUTOHEADER@,$AUTOHEADER,;t t
s, at MAKEINFO@,$MAKEINFO,;t t
+s, at AMTAR@,$AMTAR,;t t
+s, at install_sh@,$install_sh,;t t
+s, at STRIP@,$STRIP,;t t
+s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s, at AWK@,$AWK,;t t
s, at SET_MAKE@,$SET_MAKE,;t t
s, at CC@,$CC,;t t
s, at CFLAGS@,$CFLAGS,;t t
@@ -21079,6 +20973,13 @@
s, at ac_ct_CC@,$ac_ct_CC,;t t
s, at EXEEXT@,$EXEEXT,;t t
s, at OBJEXT@,$OBJEXT,;t t
+s, at DEPDIR@,$DEPDIR,;t t
+s, at am__include@,$am__include,;t t
+s, at am__quote@,$am__quote,;t t
+s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
+s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
+s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+s, at CCDEPMODE@,$CCDEPMODE,;t t
s, at EGREP@,$EGREP,;t t
s, at LN_S@,$LN_S,;t t
s, at ECHO@,$ECHO,;t t
@@ -21086,12 +20987,11 @@
s, at ac_ct_AR@,$ac_ct_AR,;t t
s, at RANLIB@,$RANLIB,;t t
s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s, at STRIP@,$STRIP,;t t
-s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
s, at CPP@,$CPP,;t t
s, at CXX@,$CXX,;t t
s, at CXXFLAGS@,$CXXFLAGS,;t t
s, at ac_ct_CXX@,$ac_ct_CXX,;t t
+s, at CXXDEPMODE@,$CXXDEPMODE,;t t
s, at CXXCPP@,$CXXCPP,;t t
s, at F77@,$F77,;t t
s, at FFLAGS@,$FFLAGS,;t t
@@ -21100,6 +21000,10 @@
s, at HAVE_DOXYGEN@,$HAVE_DOXYGEN,;t t
s, at HAVE_DOXYGEN_TRUE@,$HAVE_DOXYGEN_TRUE,;t t
s, at HAVE_DOXYGEN_FALSE@,$HAVE_DOXYGEN_FALSE,;t t
+s, at FS_DECODE_TRUE@,$FS_DECODE_TRUE,;t t
+s, at FS_DECODE_FALSE@,$FS_DECODE_FALSE,;t t
+s, at FS_ENCODE_TRUE@,$FS_ENCODE_TRUE,;t t
+s, at FS_ENCODE_FALSE@,$FS_ENCODE_FALSE,;t t
s, at VORBIS_LIBS@,$VORBIS_LIBS,;t t
s, at HAVE_VORBIS_TRUE@,$HAVE_VORBIS_TRUE,;t t
s, at HAVE_VORBIS_FALSE@,$HAVE_VORBIS_FALSE,;t t
@@ -21150,9 +21054,9 @@
(echo ':t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
fi
ac_sed_frag=`expr $ac_sed_frag + 1`
ac_beg=$ac_end
@@ -21170,21 +21074,21 @@
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
# Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21200,10 +21104,10 @@
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21241,52 +21145,24 @@
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
-
case $INSTALL in
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -21296,7 +21172,7 @@
configure_input="$ac_file. "
fi
configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ sed 's,.*/,,'` by configure."
# First look for the input files in the build tree, otherwise in the
# src tree.
@@ -21305,32 +21181,26 @@
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo "$f";;
+ echo $f;;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
@@ -21370,12 +21240,12 @@
# NAME is the cpp macro being defined and VALUE is the value it is being given.
#
# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='[ ].*$,\1#\2'
+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='[ ].*$,\1#\2'
ac_dC=' '
ac_dD=',;t'
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='$,\1#\2define\3'
ac_uC=' '
ac_uD=',;t'
@@ -21384,11 +21254,11 @@
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
@@ -21402,29 +21272,28 @@
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- # Do quote $f, to prevent DOS paths from being IFS'd.
- echo "$f";;
+ echo $f;;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo "$f"
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo "$srcdir/$f"
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo $f
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
# Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
_ACEOF
@@ -21447,9 +21316,9 @@
s,[\\$`],\\&,g
t clear
: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
: end
_ACEOF
# If some macros were called several times there might be several times
@@ -21463,13 +21332,13 @@
# example, in the case of _POSIX_SOURCE, which is predefined and required
# on some systems where configure will not decide to define it.
cat >>conftest.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
_ACEOF
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
@@ -21478,7 +21347,7 @@
# Write a limited-size here document to $tmp/defines.sed.
echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -21505,7 +21374,7 @@
# Write a limited-size here document to $tmp/undefs.sed.
echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
# Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -21539,10 +21408,10 @@
else
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21558,10 +21427,10 @@
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21581,6 +21450,12 @@
cat $tmp/config.h
rm -f $tmp/config.h
fi
+ # Run the commands associated with the file.
+ case $ac_file in
+ config.h ) # update the timestamp
+echo 'timestamp for config.h' >"./stamp-h1"
+ ;;
+ esac
done
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -21593,41 +21468,16 @@
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_dest" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
- { if $as_mkdir_p; then
- mkdir -p "$ac_dir"
- else
- as_dir="$ac_dir"
- as_dirs=
- while test ! -d "$as_dir"; do
- as_dirs="$as_dir $as_dirs"
- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- done
- test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
- { (exit 1); exit 1; }; }; }
-
ac_builddir=.
if test "$ac_dir" != .; then
@@ -21653,51 +21503,108 @@
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
-
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
echo "$as_me: executing $ac_dest commands" >&6;}
case $ac_dest in
- default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
+ depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+ # Strip MF so we end up with the name of the file.
+ mf=`echo "$mf" | sed -e 's/:.*$//'`
+ # Check whether this is an Automake generated Makefile or not.
+ # We used to match only the files named `Makefile.in', but
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+ # So let's grep whole file.
+ if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+ dirpart=`(dirname "$mf") 2>/dev/null ||
+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+ X"$mf" : 'X\(//\)$' \| \
+ X"$mf" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$mf" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ else
+ continue
+ fi
+ grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+ # Extract the definition of DEP_FILES from the Makefile without
+ # running `make'.
+ DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+ test -z "$DEPDIR" && continue
+ # When using ansi2knr, U may be empty or an underscore; expand it
+ U=`sed -n -e '/^U = / s///p' < "$mf"`
+ test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+ # We invoke sed twice because it is the simplest approach to
+ # changing $(DEPDIR) to its actual value in the expansion.
+ for file in `sed -n -e '
+ /^DEP_FILES = .*\\\\$/ {
+ s/^DEP_FILES = //
+ :loop
+ s/\\\\$//
+ p
+ n
+ /\\\\$/ b loop
+ p
+ }
+ /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ # Make sure the directory exists.
+ test -f "$dirpart/$file" && continue
+ fdir=`(dirname "$file") 2>/dev/null ||
+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$file" : 'X\(//\)[^/]' \| \
+ X"$file" : 'X\(//\)$' \| \
+ X"$file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$file" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p $dirpart/$fdir
+ else
+ as_dir=$dirpart/$fdir
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
+ { (exit 1); exit 1; }; }; }
+
+ # echo "creating $dirpart/$file"
+ echo '# dummy' > "$dirpart/$file"
+ done
+done
+ ;;
esac
done
_ACEOF
@@ -21745,7 +21652,7 @@
Library configuration (./src/libfishsound):
Vorbis support: .............. $VORBIS_SUPPORT
- Speex support: ............... $HAVE_SPEEX
+ Speex support: ............... $SPEEX_SUPPORT
Example programs (./src/examples):
@@ -21773,7 +21680,7 @@
Library configuration (./src/libfishsound):
Vorbis support: .............. $VORBIS_SUPPORT
- Speex support: ............... $HAVE_SPEEX
+ Speex support: ............... $SPEEX_SUPPORT
Example programs (./src/examples):
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure.ac
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure.ac 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/configure.ac 2004-05-25 14:19:54 UTC (rev 6754)
@@ -6,7 +6,7 @@
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(libfishsound, 0.6.0)
+AM_INIT_AUTOMAKE(libfishsound, 0.6.2)
AM_CONFIG_HEADER(config.h)
SHARED_VERSION_INFO="1:0:0"
@@ -60,6 +60,7 @@
else
AC_DEFINE(FS_DECODE, [0], [Do not build decoding support])
fi
+AM_CONDITIONAL(FS_DECODE, [test "x${ac_enable_decode}" = "xyes"])
dnl
dnl Configuration option for building of encoding support.
@@ -75,6 +76,7 @@
else
AC_DEFINE(FS_ENCODE, [0], [Do not build encoding support])
fi
+AM_CONDITIONAL(FS_ENCODE, [test "x${ac_enable_encode}" = "xyes"])
dnl
dnl Check decode/encode option sanity
@@ -151,6 +153,8 @@
dnl
HAVE_SPEEX=no
+HAVE_SPEEX_1_1=no
+SPEEX_SUPPORT=no
ac_enable_speex=yes
AC_ARG_ENABLE(speex,
@@ -163,6 +167,20 @@
AC_CHECK_HEADER(speex.h, HAVE_SPEEX="yes", HAVE_SPEEX="no")
fi
if test "x$HAVE_SPEEX" = xyes ; then
+
+ dnl Test for libspeex 1.1.x
+ AC_CHECK_LIB(speex, speex_preprocess, HAVE_SPEEX_1_1="maybe", , [-lm])
+ if test "x$HAVE_SPEEX_1_1" = xmaybe; then
+ AC_CHECK_HEADER(speex_preprocess.h, HAVE_SPEEX_1_1="yes",
+ HAVE_SPEEX_1_1="no")
+ fi
+ if test "x$HAVE_SPEEX_1_1" = xyes ; then
+ AC_DEFINE(HAVE_SPEEX_1_1, [1], [Define to 1 if you have libspeex 1.1.x])
+ SPEEX_SUPPORT="yes (1.1.x)"
+ else
+ SPEEX_SUPPORT="yes (1.0.x)"
+ fi
+
AC_DEFINE(HAVE_SPEEX, [1], [Define to 1 if you have libspeex])
SPEEX_LIBS="-lspeex -lm"
AC_SUBST(SPEEX_LIBS)
@@ -170,7 +188,7 @@
AC_DEFINE(HAVE_SPEEX, [0], [Define to 1 if you have libspeex])
fi
else
- HAVE_SPEEX=disabled
+ SPEEX_SUPPORT=disabled
fi
AM_CONDITIONAL(HAVE_SPEEX, [test "x$HAVE_SPEEX" = "xyes"])
@@ -318,17 +336,17 @@
AC_SUBST(SHARED_VERSION_INFO)
if test "x$HAVE_OGGZ" = xyes ; then
- fishsound_examples="identify"
+ fishsound_examples="fishsound-identify"
if test "x$HAVE_LIBSNDFILE1" = xyes ; then
if test "x${ac_enable_decode}" = xyes ; then
- fishsound_examples="$fishsound_examples decode"
+ fishsound_examples="$fishsound_examples fishsound-decode"
fi
if test "x${ac_enable_encode}" = xyes ; then
- fishsound_examples="$fishsound_examples encode"
+ fishsound_examples="$fishsound_examples fishsound-encode"
fi
else
- fishsound_examples="$fishsound_examples (decode and encode require libsndfile)"
+ fishsound_examples="$fishsound_examples (fishsound-decode and fishsound-encode require libsndfile)"
fi
else
fishsound_examples="(none; liboggz and libsndfile required)"
@@ -361,7 +379,7 @@
Library configuration (./src/libfishsound):
Vorbis support: .............. $VORBIS_SUPPORT
- Speex support: ............... $HAVE_SPEEX
+ Speex support: ............... $SPEEX_SUPPORT
Example programs (./src/examples):
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/depcomp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/depcomp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/depcomp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,423 @@
+#! /bin/sh
+
+# depcomp - compile a program generating dependencies as side-effects
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <<a href="mailto:oliva at dcc.unicamp.br?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20src>.
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+fi
+# `libtool' can also be set to `yes' or `no'.
+
+if test -z "$depfile"; then
+ base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
+ dir=`echo "$object" | sed 's,/.*$,/,'`
+ if test "$dir" = "$object"; then
+ dir=
+ fi
+ # FIXME: should be _deps on DOS.
+ depfile="$dir.deps/$base"
+fi
+
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags. We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write. Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+ # HP compiler uses -M and no extra arg.
+ gccflag=-M
+ depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff. Hmm.
+ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ mv "$tmpdepfile" "$depfile"
+ ;;
+
+gcc)
+## There are various ways to get dependency output from gcc. Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+## up in a subdir. Having to rename by hand is ugly.
+## (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+## -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+## than renaming).
+ if test -z "$gccflag"; then
+ gccflag=-MD,
+ fi
+ "$@" -Wp,"$gccflag$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e expression handles DOS-style file names with drive letters.
+ sed -e 's/^[^:]*: / /' \
+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the `deleted header file' problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header). We avoid this by adding
+## dummy dependencies for each header file. Too bad gcc doesn't do
+## this for us directly.
+ tr ' ' '
+' < "$tmpdepfile" |
+## Some versions of gcc put a space before the `:'. On the theory
+## that the space means something, we add a space to the output as
+## well.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+hp)
+ # This case exists only to let depend.m4 do its work. It works by
+ # looking at the text of this script. This case will never be run,
+ # since it is checked for above.
+ exit 1
+ ;;
+
+sgi)
+ if test "$libtool" = yes; then
+ "$@" "-Wp,-MDupdate,$tmpdepfile"
+ else
+ "$@" -MDupdate "$tmpdepfile"
+ fi
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+ rm -f "$depfile"
+
+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
+ echo "$object : \\" > "$depfile"
+
+ # Clip off the initial element (the dependent). Don't try to be
+ # clever and replace this with sed code, as IRIX sed won't handle
+ # lines with more than a fixed number of characters (4096 in
+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
+ # the IRIX cc adds comments like `#:fec' to the end of the
+ # dependency line.
+ tr ' ' '
+' < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
+ tr '
+' ' ' >> $depfile
+ echo >> $depfile
+
+ # The second pass generates a dummy entry for each header file.
+ tr ' ' '
+' < "$tmpdepfile" \
+ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+ >> $depfile
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+ # "include basename.Plo" scheme.
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
+aix)
+ # The C for AIX Compiler uses -M and outputs the dependencies
+ # in a .u file. This file always lives in the current directory.
+ # Also, the AIX compiler puts `$object:' at the start of each line;
+ # $object doesn't have directory information.
+ stripped=`echo "$object" | sed -e 's,^.*/,,' -e 's/\(.*\)\..*$/\1/'`
+ tmpdepfile="$stripped.u"
+ outname="$stripped.o"
+ if test "$libtool" = yes; then
+ "$@" -Wc,-M
+ else
+ "$@" -M
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile"
+ exit $stat
+ fi
+
+ if test -f "$tmpdepfile"; then
+ # Each line is of the form `foo.o: dependent.h'.
+ # Do two passes, one to just change these to
+ # `$object: dependent.h' and one to simply `dependent.h:'.
+ sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+ sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+ else
+ # The sourcefile does not contain any dependencies, so just
+ # store a dummy comment line, to avoid errors with the Makefile
+ # "include basename.Plo" scheme.
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
+tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+ # dependencies in `foo.d' instead, so we check for that too.
+ # Subdirectories are respected.
+ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+ test "x$dir" = "x$object" && dir=
+ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+
+ if test "$libtool" = yes; then
+ tmpdepfile1="$dir.libs/$base.lo.d"
+ tmpdepfile2="$dir.libs/$base.d"
+ "$@" -Wc,-MD
+ else
+ tmpdepfile1="$dir$base.o.d"
+ tmpdepfile2="$dir$base.d"
+ "$@" -MD
+ fi
+
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+ rm -f "$tmpdepfile1" "$tmpdepfile2"
+ exit $stat
+ fi
+
+ if test -f "$tmpdepfile1"; then
+ tmpdepfile="$tmpdepfile1"
+ else
+ tmpdepfile="$tmpdepfile2"
+ fi
+ if test -f "$tmpdepfile"; then
+ sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+ # That's a space and a tab in the [].
+ sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+ else
+ echo "#dummy" > "$depfile"
+ fi
+ rm -f "$tmpdepfile"
+ ;;
+
+#nosideeffect)
+ # This comment above is used by automake to tell side-effect
+ # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+ # Important note: in order to support this mode, a compiler *must*
+ # always write the proprocessed file to stdout, regardless of -o.
+ "$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test $1 != '--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ # Remove `-o $object'. We will use -o /dev/null later,
+ # however we can't do the remplacement now because
+ # `-o $object' might simply not be used
+ IFS=" "
+ for arg
+ do
+ case $arg in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ *)
+ set fnord "$@" "$arg"
+ shift # fnord
+ shift # $arg
+ ;;
+ esac
+ done
+
+ test -z "$dashmflag" && dashmflag=-M
+ "$@" -o /dev/null $dashmflag | sed 's:^[^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ tr ' ' '
+' < "$tmpdepfile" | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+dashXmstdout)
+ # This case only exists to satisfy depend.m4. It is never actually
+ # run, as this mode is specially recognized in the preamble.
+ exit 1
+ ;;
+
+makedepend)
+ "$@" || exit $?
+ # X makedepend
+ shift
+ cleared=no
+ for arg in "$@"; do
+ case $cleared in
+ no)
+ set ""; shift
+ cleared=yes ;;
+ esac
+ case "$arg" in
+ -D*|-I*)
+ set fnord "$@" "$arg"; shift ;;
+ -*)
+ ;;
+ *)
+ set fnord "$@" "$arg"; shift ;;
+ esac
+ done
+ obj_suffix="`echo $object | sed 's/^.*\././'`"
+ touch "$tmpdepfile"
+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+ rm -f "$depfile"
+ cat < "$tmpdepfile" > "$depfile"
+ sed '1,2d' "$tmpdepfile" | tr ' ' '
+' | \
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly. Breaking it into two sed invocations is a workaround.
+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile" "$tmpdepfile".bak
+ ;;
+
+cpp)
+ # Important note: in order to support this mode, a compiler *must*
+ # always write the proprocessed file to stdout.
+ "$@" || exit $?
+
+ # Remove the call to Libtool.
+ if test "$libtool" = yes; then
+ while test $1 != '--mode=compile'; do
+ shift
+ done
+ shift
+ fi
+
+ # Remove `-o $object'.
+ IFS=" "
+ for arg
+ do
+ case $arg in
+ -o)
+ shift
+ ;;
+ $object)
+ shift
+ ;;
+ *)
+ set fnord "$@" "$arg"
+ shift # fnord
+ shift # $arg
+ ;;
+ esac
+ done
+
+ "$@" -E |
+ sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed '$ s: \\$::' > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ cat < "$tmpdepfile" >> "$depfile"
+ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+msvisualcpp)
+ # Important note: in order to support this mode, a compiler *must*
+ # always write the proprocessed file to stdout, regardless of -o,
+ # because we must use -o when running libtool.
+ "$@" || exit $?
+ IFS=" "
+ for arg
+ do
+ case "$arg" in
+ "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+ set fnord "$@"
+ shift
+ shift
+ ;;
+ *)
+ set fnord "$@" "$arg"
+ shift
+ shift
+ ;;
+ esac
+ done
+ "$@" -E |
+ sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile"
+ echo " " >> "$depfile"
+ . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+ rm -f "$tmpdepfile"
+ ;;
+
+none)
+ exec "$@"
+ ;;
+
+*)
+ echo "Unknown depmode $depmode" 1>&2
+ exit 1
+ ;;
+esac
+
+exit 0
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -31,13 +33,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
ACLOCAL = @ACLOCAL@
@@ -45,12 +43,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -59,27 +61,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -93,7 +97,9 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
-
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
docdir = $(prefix)/share/doc/@PACKAGE@
EXTRA_DIST = Doxyfile.in white-xifish.png
@@ -101,131 +107,162 @@
doc_DATA = doxygen-build.stamp
dist_docdir = $(distdir)/libfishsound
+subdir = doc
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = Doxyfile
-DATA = $(doc_DATA)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = Doxyfile
+DIST_SOURCES =
+DATA = $(doc_DATA)
-DIST_COMMON = Doxyfile.in Makefile.am Makefile.in
+DIST_COMMON = Doxyfile.in Makefile.am Makefile.in
+all: all-am
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu doc/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+Doxyfile: $(top_builddir)/config.status Doxyfile.in
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mostlyclean-libtool:
+ -rm -f *.lo
-Doxyfile: $(top_builddir)/config.status Doxyfile.in
- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+clean-libtool:
+ -rm -rf .libs _libs
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+docDATA_INSTALL = $(INSTALL_DATA)
install-docDATA: $(doc_DATA)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(docdir)
@list='$(doc_DATA)'; for p in $$list; do \
- if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \
- $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \
- else if test -f $$p; then \
- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
- $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
- fi; fi; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f"; \
+ $(docDATA_INSTALL) $$d$$p $(DESTDIR)$(docdir)/$$f; \
done
uninstall-docDATA:
@$(NORMAL_UNINSTALL)
- list='$(doc_DATA)'; for p in $$list; do \
- rm -f $(DESTDIR)$(docdir)/$$p; \
+ @list='$(doc_DATA)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f $(DESTDIR)$(docdir)/$$f"; \
+ rm -f $(DESTDIR)$(docdir)/$$f; \
done
tags: TAGS
TAGS:
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-subdir = doc
-
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="${top_distdir}" distdir="$(distdir)" \
+ dist-hook
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(DATA)
+
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
+
+install: install-am
install-exec: install-exec-am
-
-install-data-am: install-docDATA install-data-local
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-docDATA uninstall-local
-uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
+
+installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(docdir)
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-clean-am: clean-generic mostlyclean-am clean-local
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-generic distclean-libtool
-distclean-am: distclean-generic clean-am
- -rm -f libtool
+dvi: dvi-am
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+info-am:
+
+install-data-am: install-data-local install-docDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-am
-.PHONY: uninstall-docDATA install-docDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-local install-data-am install-data install-am \
-install uninstall-local uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-docDATA uninstall-info-am uninstall-local
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local distclean distclean-generic distclean-libtool \
+ distdir dvi dvi-am info info-am install install-am install-data \
+ install-data-am install-data-local install-docDATA install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool uninstall uninstall-am \
+ uninstall-docDATA uninstall-info-am uninstall-local
+
+
@HAVE_DOXYGEN_TRUE at doxygen-build.stamp: Doxyfile $(top_srcdir)/include/fishsound/*.h
@HAVE_DOXYGEN_TRUE@ doxygen
@HAVE_DOXYGEN_TRUE@ touch doxygen-build.stamp
@@ -269,7 +306,6 @@
clean-local:
if test -d libfishsound; then rm -rf libfishsound; fi
if test -f doxygen-build.stamp; then rm -f doxygen-build.stamp; fi
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/annotated.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/annotated.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/annotated.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,14 +3,16 @@
<title>libfishsound: Annotated Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindexHL" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>libfishsound Data Structures</h1>Here are the data structures with brief descriptions:<table>
+ <tr><td class="indexkey"><a class="el" href="structFishSoundComment.html">FishSoundComment</a></td><td class="indexvalue">A comment </td></tr>
<tr><td class="indexkey"><a class="el" href="structFishSoundFormat.html">FishSoundFormat</a></td><td class="indexvalue">Info about a particular sound format </td></tr>
<tr><td class="indexkey"><a class="el" href="structFishSoundInfo.html">FishSoundInfo</a></td><td class="indexvalue">Info about a particular encoder/decoder instance </td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h-source.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h-source.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,96 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>libfishsound: comments.h Source File</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.3.5 -->
+<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<h1>comments.h</h1>Go to the documentation of this file.<div class="fragment"><pre>00001
+00002 <span class="comment">/*</span>
+00003 <span class="comment"> Copyright (C) 2003 Commonwealth Scientific and Industrial Research</span>
+00004 <span class="comment"> Organisation (CSIRO) Australia</span>
+00005 <span class="comment"></span>
+00006 <span class="comment"> Redistribution and use in source and binary forms, with or without</span>
+00007 <span class="comment"> modification, are permitted provided that the following conditions</span>
+00008 <span class="comment"> are met:</span>
+00009 <span class="comment"></span>
+00010 <span class="comment"> - Redistributions of source code must retain the above copyright</span>
+00011 <span class="comment"> notice, this list of conditions and the following disclaimer.</span>
+00012 <span class="comment"></span>
+00013 <span class="comment"> - Redistributions in binary form must reproduce the above copyright</span>
+00014 <span class="comment"> notice, this list of conditions and the following disclaimer in the</span>
+00015 <span class="comment"> documentation and/or other materials provided with the distribution.</span>
+00016 <span class="comment"></span>
+00017 <span class="comment"> - Neither the name of CSIRO Australia nor the names of its</span>
+00018 <span class="comment"> contributors may be used to endorse or promote products derived from</span>
+00019 <span class="comment"> this software without specific prior written permission.</span>
+00020 <span class="comment"></span>
+00021 <span class="comment"> THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS</span>
+00022 <span class="comment"> ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT</span>
+00023 <span class="comment"> LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A</span>
+00024 <span class="comment"> PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR</span>
+00025 <span class="comment"> CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,</span>
+00026 <span class="comment"> EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,</span>
+00027 <span class="comment"> PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR</span>
+00028 <span class="comment"> PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF</span>
+00029 <span class="comment"> LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING</span>
+00030 <span class="comment"> NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS</span>
+00031 <span class="comment"> SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</span>
+00032 <span class="comment">*/</span>
+00033
+00034 <span class="preprocessor">#ifndef __FISH_SOUND_COMMENT_H__</span>
+00035 <span class="preprocessor"></span><span class="preprocessor">#define __FISH_SOUND_COMMENT_H__</span>
+00036 <span class="preprocessor"></span>
+00088 <span class="preprocessor">#include <<a class="code" href="fishsound_8h.html">fishsound/fishsound.h</a>></span>
+00089
+<a name="l00093"></a><a class="code" href="structFishSoundComment.html">00093</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00095"></a><a class="code" href="structFishSoundComment.html#o0">00095</a> <span class="keywordtype">char</span> * name;
+00096
+<a name="l00098"></a><a class="code" href="structFishSoundComment.html#o1">00098</a> <span class="keywordtype">char</span> * value;
+00099 } <a class="code" href="structFishSoundComment.html">FishSoundComment</a>;
+00100
+00101 <span class="preprocessor">#ifdef __cplusplus</span>
+00102 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="stringliteral">"C"</span> {
+00103 <span class="preprocessor">#endif</span>
+00104 <span class="preprocessor"></span>
+00112 <span class="keyword">const</span> <span class="keywordtype">char</span> *
+00113 <a class="code" href="comments_8h.html#a0">fish_sound_comment_get_vendor</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00114
+00115
+00122 <span class="keyword">const</span> <a class="code" href="structFishSoundComment.html">FishSoundComment</a> *
+00123 <a class="code" href="comments_8h.html#a1">fish_sound_comment_first</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00124
+00132 <span class="keyword">const</span> <a class="code" href="structFishSoundComment.html">FishSoundComment</a> *
+00133 <a class="code" href="comments_8h.html#a2">fish_sound_comment_next</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keyword">const</span> <a class="code" href="structFishSoundComment.html">FishSoundComment</a> * comment);
+00134
+00144 <span class="keyword">const</span> <a class="code" href="structFishSoundComment.html">FishSoundComment</a> *
+00145 <a class="code" href="comments_8h.html#a3">fish_sound_comment_first_byname</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">char</span> * name);
+00146
+00157 <span class="keyword">const</span> <a class="code" href="structFishSoundComment.html">FishSoundComment</a> *
+00158 <a class="code" href="comments_8h.html#a4">fish_sound_comment_next_byname</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound,
+00159 <span class="keyword">const</span> <a class="code" href="structFishSoundComment.html">FishSoundComment</a> * comment);
+00160
+00169 <span class="keywordtype">int</span>
+00170 <a class="code" href="comments_8h.html#a5">fish_sound_comment_add</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <a class="code" href="structFishSoundComment.html">FishSoundComment</a> * comment);
+00171
+00181 <span class="keywordtype">int</span>
+00182 <a class="code" href="comments_8h.html#a6">fish_sound_comment_add_byname</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keyword">const</span> <span class="keywordtype">char</span> * name,
+00183 <span class="keyword">const</span> <span class="keywordtype">char</span> * value);
+00184
+00194 <span class="keywordtype">int</span>
+00195 <a class="code" href="comments_8h.html#a7">fish_sound_comment_remove</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <a class="code" href="structFishSoundComment.html">FishSoundComment</a> * comment);
+00196
+00205 <span class="keywordtype">int</span>
+00206 <a class="code" href="comments_8h.html#a8">fish_sound_comment_remove_byname</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">char</span> * name);
+00207
+00208 <span class="preprocessor">#ifdef __cplusplus</span>
+00209 <span class="preprocessor"></span>}
+00210 <span class="preprocessor">#endif</span>
+00211 <span class="preprocessor"></span>
+00212 <span class="preprocessor">#endif </span><span class="comment">/* __FISH_SOUND_COMMENTS_H__ */</span>
+</pre></div><hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
+</body>
+</html>
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/comments_8h.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,520 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>libfishsound: comments.h File Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.3.5 -->
+<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<h1>comments.h File Reference</h1>Encoding and decoding of comments.
+More...
+<p>
+<code>#include <<a class="el" href="fishsound_8h-source.html">fishsound/fishsound.h</a>></code><br>
+
+<p>
+Go to the source code of this file.<table border=0 cellpadding=0 cellspacing=0>
+<tr><td></td></tr>
+<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>struct </td><td class="memItemRight" valign=bottom><a class="el" href="structFishSoundComment.html">FishSoundComment</a></td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">A comment. </em> More...<br><br></td></tr>
+<tr><td colspan=2><br><h2>Functions</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>const char * </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a0">fish_sound_comment_get_vendor</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Retrieve the vendor string. <a href="#a0"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a1">fish_sound_comment_first</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Retrieve the first comment. <a href="#a1"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a2">fish_sound_comment_next</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> *comment)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Retrieve the next comment. <a href="#a2"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a3">fish_sound_comment_first_byname</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, char *name)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Retrieve the first comment with a given name. <a href="#a3"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a4">fish_sound_comment_next_byname</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> *comment)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Retrieve the next comment following and with the same name as a given comment. <a href="#a4"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a5">fish_sound_comment_add</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, <a class="el" href="structFishSoundComment.html">FishSoundComment</a> *comment)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Add a comment. <a href="#a5"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a6">fish_sound_comment_add_byname</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, const char *name, const char *value)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Add a comment by name and value. <a href="#a6"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a7">fish_sound_comment_remove</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, <a class="el" href="structFishSoundComment.html">FishSoundComment</a> *comment)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Remove a comment. <a href="#a7"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="comments_8h.html#a8">fish_sound_comment_remove_byname</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, char *name)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Remove all comments with a given name. <a href="#a8"></a><br><br></td></tr>
+</table>
+<hr><a name="_details"></a><h2>Detailed Description</h2>
+Encoding and decoding of comments.
+<p>
+Vorbis and Speex bitstreams use a comment format called "Vorbiscomment", defined here. Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are defined in that document.<p>
+The following general features of Vorbiscomment are relevant to this API:<ul>
+<li>Each stream has one comment packet, which occurs before any encoded audio data in the stream.</li><li>When encoding, FishSound will generate the comment block and pass it to the encoded() callback in sequence, just like any other packet. Hence, all comments must be set before any call to <a class="el" href="fishsound_8h.html#a8">fish_sound_encode()</a>.</li><li>When decoding, FishSound will decode the comment block before calling the first decoded() callback. Hence, retrieving comment data is possible from as soon as the decoded() callback is first called.</li></ul>
+<p>
+Each comment block contains one Vendor string, which can be retrieved with <a class="el" href="comments_8h.html#a0">fish_sound_comment_get_vendor()</a>. When encoding, this string is effectively fixed by the codec libraries; it cannot be set by the application.<p>
+The rest of a comment block consists of name</em> = <em>value</em> pairs, with the following restrictions:<ul>
+<li>Both the name</em> and <em>value</em> must be non-empty</li><li>The <em>name</em> is case-insensitive and must consist of ASCII within the range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.</li><li>The <em>name</em> is not unique; multiple entries may exist with equivalent <em>name</em> within a Vorbiscomment block.</li><li>The <em>value</em> may be any UTF-8 string.</li></ul>
+<h2><a class="anchor" name="comments_get">
+Retrieving comments</a></h2>
+FishSound contains API methods to iterate through all comments associated with a FishSound* handle (<a class="el" href="comments_8h.html#a1">fish_sound_comment_first()</a> and <a class="el" href="comments_8h.html#a2">fish_sound_comment_next()</a>, and to iterate through comments matching a particular name (<a class="el" href="comments_8h.html#a3">fish_sound_comment_first_byname()</a> and <a class="el" href="comments_8h.html#a4">fish_sound_comment_next_byname()</a>). Given that multiple comments may exist with the same name</em>, you should not use <a class="el" href="comments_8h.html#a3">fish_sound_comment_first_byname()</a> as a simple "get" function.<h2><a class="anchor" name="comments_set">
+Encoding comments</a></h2>
+For encoding, FishSound contains API methods for adding comments (<a class="el" href="comments_8h.html#a5">fish_sound_comment_add()</a> and <a class="el" href="comments_8h.html#a6">fish_sound_comment_add_byname()</a> and for removing comments (<a class="el" href="comments_8h.html#a7">fish_sound_comment_remove()</a> and <a class="el" href="comments_8h.html#a8">fish_sound_comment_remove_byname()</a>).<hr><h2>Function Documentation</h2>
+<a class="anchor" name="a5" doxytag="comments.h::fish_sound_comment_add" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> int fish_sound_comment_add </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap><a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td>
+ <td class="mdname" nowrap> comment</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Add a comment.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle (created with mode FISH_SOUND_ENCODE) </td></tr>
+ <tr><td valign=top>comment</em> </td><td>The comment to add </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>0</em> </td><td>Success </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_BAD</em> </td><td><em>fsound</em> is not a valid FishSound* handle </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_INVALID</em> </td><td>Operation not suitable for this FishSound </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a6" doxytag="comments.h::fish_sound_comment_add_byname" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> int fish_sound_comment_add_byname </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>const char * </td>
+ <td class="mdname" nowrap> name</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>const char * </td>
+ <td class="mdname" nowrap> value</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Add a comment by name and value.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle (created with mode FISH_SOUND_ENCODE) </td></tr>
+ <tr><td valign=top>name</em> </td><td>The name of the comment to add </td></tr>
+ <tr><td valign=top>value</em> </td><td>The contents of the comment to add </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>0</em> </td><td>Success </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_BAD</em> </td><td><em>fsound</em> is not a valid FishSound* handle </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_INVALID</em> </td><td>Operation not suitable for this FishSound </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a1" doxytag="comments.h::fish_sound_comment_first" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> const <a class="el" href="structFishSoundComment.html">FishSoundComment</a>* fish_sound_comment_first </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname1" valign="top" nowrap> fsound</em> </td>
+ <td class="md" valign="top"> ) </td>
+ <td class="md" nowrap></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Retrieve the first comment.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>A read-only copy of the first comment, or NULL if no comments exist for this FishSound* object. </dd></dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a3" doxytag="comments.h::fish_sound_comment_first_byname" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> const <a class="el" href="structFishSoundComment.html">FishSoundComment</a>* fish_sound_comment_first_byname </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>char * </td>
+ <td class="mdname" nowrap> name</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Retrieve the first comment with a given name.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ <tr><td valign=top>name</em> </td><td>the name of the comment to retrieve. </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>A read-only copy of the first comment matching the given name</em>. </dd></dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>NULL</em> </td><td>no match was found. </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Note:</b></dt><dd>If name</em> is NULL, the behaviour is the same as for <a class="el" href="comments_8h.html#a1">fish_sound_comment_first()</a> </dd></dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a0" doxytag="comments.h::fish_sound_comment_get_vendor" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> const char* fish_sound_comment_get_vendor </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname1" valign="top" nowrap> fsound</em> </td>
+ <td class="md" valign="top"> ) </td>
+ <td class="md" nowrap></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Retrieve the vendor string.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>A read-only copy of the vendor string </dd></dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>NULL</em> </td><td>No vendor string is associated with <em>fsound</em>, or <em>fsound</em> is NULL. </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a2" doxytag="comments.h::fish_sound_comment_next" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> const <a class="el" href="structFishSoundComment.html">FishSoundComment</a>* fish_sound_comment_next </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td>
+ <td class="mdname" nowrap> comment</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Retrieve the next comment.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ <tr><td valign=top>comment</em> </td><td>The previous comment. </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>A read-only copy of the comment immediately following the given comment. </dd></dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a4" doxytag="comments.h::fish_sound_comment_next_byname" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> const <a class="el" href="structFishSoundComment.html">FishSoundComment</a>* fish_sound_comment_next_byname </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>const <a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td>
+ <td class="mdname" nowrap> comment</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Retrieve the next comment following and with the same name as a given comment.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ <tr><td valign=top>comment</em> </td><td>A comment </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>A read-only copy of the next comment with the same name as comment</em>. </dd></dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>NULL</em> </td><td>no further comments with the same name exist for this FishSound* object. </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a7" doxytag="comments.h::fish_sound_comment_remove" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> int fish_sound_comment_remove </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap><a class="el" href="structFishSoundComment.html">FishSoundComment</a> * </td>
+ <td class="mdname" nowrap> comment</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Remove a comment.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle (created with FISH_SOUND_ENCODE) </td></tr>
+ <tr><td valign=top>comment</em> </td><td>The comment to remove. </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>1</em> </td><td>Success: comment removed </td></tr>
+ <tr><td valign=top>0</em> </td><td>No-op: comment not found, nothing to remove </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_BAD</em> </td><td><em>fsound</em> is not a valid FishSound* handle </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_INVALID</em> </td><td>Operation not suitable for this FishSound </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
+<a class="anchor" name="a8" doxytag="comments.h::fish_sound_comment_remove_byname" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> int fish_sound_comment_remove_byname </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>char * </td>
+ <td class="mdname" nowrap> name</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Remove all comments with a given name.
+<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle (created with FISH_SOUND_ENCODE) </td></tr>
+ <tr><td valign=top>name</em> </td><td>The name of the comments to remove </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>>= 0</em> </td><td>The number of comments removed </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_BAD</em> </td><td><em>fsound</em> is not a valid FishSound* handle </td></tr>
+ <tr><td valign=top>FISH_SOUND_ERR_INVALID</em> </td><td>Operation not suitable for this FishSound </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
+</body>
+</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h-source.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h-source.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: constants.h Source File</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>constants.h</h1>Go to the documentation of this file.<div class="fragment"><pre>00001 <span class="comment">/*</span>
00002 <span class="comment"> Copyright (C) 2003 Commonwealth Scientific and Industrial Research</span>
@@ -40,45 +40,54 @@
00033 <span class="preprocessor">#ifndef __FISH_SOUND_CONSTANTS_H__</span>
00034 <span class="preprocessor"></span><span class="preprocessor">#define __FISH_SOUND_CONSTANTS_H__</span>
00035 <span class="preprocessor"></span>
-<a name="l00041"></a><a class="code" href="constants_8h.html#a18">00041</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a18">_FishSoundMode</a> {
-00043 <a class="code" href="constants_8h.html#a18a4">FISH_SOUND_DECODE</a> = 0x10,
+<a name="l00041"></a><a class="code" href="constants_8h.html#a22">00041</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a22">_FishSoundMode</a> {
+00043 <a class="code" href="constants_8h.html#a22a4">FISH_SOUND_DECODE</a> = 0x10,
00044
-00046 <a class="code" href="constants_8h.html#a18a5">FISH_SOUND_ENCODE</a> = 0x20
+00046 <a class="code" href="constants_8h.html#a22a5">FISH_SOUND_ENCODE</a> = 0x20
00047 } <a class="code" href="constants_8h.html#a0">FishSoundMode</a>;
00048
-<a name="l00050"></a><a class="code" href="constants_8h.html#a19">00050</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a19">_FishSoundCodecID</a> {
-00052 <a class="code" href="constants_8h.html#a19a6">FISH_SOUND_UNKNOWN</a> = 0x00,
+<a name="l00050"></a><a class="code" href="constants_8h.html#a23">00050</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a23">_FishSoundCodecID</a> {
+00052 <a class="code" href="constants_8h.html#a23a6">FISH_SOUND_UNKNOWN</a> = 0x00,
00053
-00055 <a class="code" href="constants_8h.html#a19a7">FISH_SOUND_VORBIS</a> = 0x01,
+00055 <a class="code" href="constants_8h.html#a23a7">FISH_SOUND_VORBIS</a> = 0x01,
00056
-00058 <a class="code" href="constants_8h.html#a19a8">FISH_SOUND_SPEEX</a> = 0x02
+00058 <a class="code" href="constants_8h.html#a23a8">FISH_SOUND_SPEEX</a> = 0x02
00059 } <a class="code" href="constants_8h.html#a1">FishSoundCodecID</a>;
00060
-<a name="l00062"></a><a class="code" href="constants_8h.html#a20">00062</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a20">_FishSoundCommand</a> {
-00064 <a class="code" href="constants_8h.html#a20a9">FISH_SOUND_COMMAND_NOP</a> = 0x0000,
+<a name="l00062"></a><a class="code" href="constants_8h.html#a24">00062</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a24">_FishSoundCommand</a> {
+00064 <a class="code" href="constants_8h.html#a24a9">FISH_SOUND_COMMAND_NOP</a> = 0x0000,
00065
-00067 <a class="code" href="constants_8h.html#a20a10">FISH_SOUND_GET_INFO</a> = 0x1000,
+00067 <a class="code" href="constants_8h.html#a24a10">FISH_SOUND_GET_INFO</a> = 0x1000,
00068
-00070 <a class="code" href="constants_8h.html#a20a11">FISH_SOUND_GET_INTERLEAVE</a> = 0x2000,
+00070 <a class="code" href="constants_8h.html#a24a11">FISH_SOUND_GET_INTERLEAVE</a> = 0x2000,
00071
-00073 <a class="code" href="constants_8h.html#a20a12">FISH_SOUND_SET_INTERLEAVE</a> = 0x2001,
+00073 <a class="code" href="constants_8h.html#a24a12">FISH_SOUND_SET_INTERLEAVE</a> = 0x2001,
00074
00075 FISH_SOUND_SET_ENCODE_VBR = 0x4000,
00076
00077 FISH_SOUND_COMMAND_MAX
00078 } <a class="code" href="constants_8h.html#a2">FishSoundCommand</a>;
00079
-<a name="l00081"></a><a class="code" href="constants_8h.html#a21">00081</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a21">_FishSoundError</a> {
-00083 <a class="code" href="constants_8h.html#a21a15">FISH_SOUND_OK</a> = 0,
+<a name="l00081"></a><a class="code" href="constants_8h.html#a25">00081</a> <span class="keyword">typedef</span> <span class="keyword">enum</span> <a class="code" href="constants_8h.html#a25">_FishSoundError</a> {
+00083 <a class="code" href="constants_8h.html#a25a15">FISH_SOUND_OK</a> = 0,
00084
-00086 <a class="code" href="constants_8h.html#a21a16">FISH_SOUND_ERR_DISABLED</a> = -10,
+00086 <a class="code" href="constants_8h.html#a25a16">FISH_SOUND_ERR_GENERIC</a> = -1,
00087
-00089 <a class="code" href="constants_8h.html#a21a17">FISH_SOUND_ERR_SHORT_IDENTIFY</a> = -20
-00090 } <a class="code" href="constants_8h.html#a3">FishSoundError</a>;
-00091
-00092 <span class="preprocessor">#endif </span><span class="comment">/* __FISH_SOUND_CONSTANTS_H__ */</span>
-</pre></div><hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+00089 <a class="code" href="constants_8h.html#a25a17">FISH_SOUND_ERR_BAD</a> = -2,
+00090
+00092 <a class="code" href="constants_8h.html#a25a18">FISH_SOUND_ERR_INVALID</a> = -3,
+00093
+00095 <a class="code" href="constants_8h.html#a25a19">FISH_SOUND_ERR_DISABLED</a> = -10,
+00096
+00098 <a class="code" href="constants_8h.html#a25a20">FISH_SOUND_ERR_SHORT_IDENTIFY</a> = -20,
+00099
+00101 <a class="code" href="constants_8h.html#a25a21">FISH_SOUND_ERR_COMMENT_INVALID</a> = -21
+00102 } <a class="code" href="constants_8h.html#a3">FishSoundError</a>;
+00103
+00104 <span class="preprocessor">#endif </span><span class="comment">/* __FISH_SOUND_CONSTANTS_H__ */</span>
+</pre></div><hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/constants_8h.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: constants.h File Reference</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>constants.h File Reference</h1>Constants used by libfishsound.
<a href="#_details">More...</a>
@@ -14,63 +14,70 @@
<tr><td></td></tr>
<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
<tr><td class="memItemLeft" nowrap align=right valign=top><a class="anchor" name="a0" doxytag="constants.h::FishSoundMode" ></a>
-typedef enum <a class="el" href="constants_8h.html#a18">_FishSoundMode</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a0">FishSoundMode</a></td></tr>
+typedef enum <a class="el" href="constants_8h.html#a22">_FishSoundMode</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a0">FishSoundMode</a></td></tr>
<tr><td class="mdescLeft"> </td><td class="mdescRight">Mode of operation (encode or decode). <br><br></td></tr>
<tr><td class="memItemLeft" nowrap align=right valign=top><a class="anchor" name="a1" doxytag="constants.h::FishSoundCodecID" ></a>
-typedef enum <a class="el" href="constants_8h.html#a19">_FishSoundCodecID</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a1">FishSoundCodecID</a></td></tr>
+typedef enum <a class="el" href="constants_8h.html#a23">_FishSoundCodecID</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a1">FishSoundCodecID</a></td></tr>
<tr><td class="mdescLeft"> </td><td class="mdescRight">Identifiers for supported codecs. <br><br></td></tr>
<tr><td class="memItemLeft" nowrap align=right valign=top><a class="anchor" name="a2" doxytag="constants.h::FishSoundCommand" ></a>
-typedef enum <a class="el" href="constants_8h.html#a20">_FishSoundCommand</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a2">FishSoundCommand</a></td></tr>
+typedef enum <a class="el" href="constants_8h.html#a24">_FishSoundCommand</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a2">FishSoundCommand</a></td></tr>
<tr><td class="mdescLeft"> </td><td class="mdescRight">Command codes. <br><br></td></tr>
<tr><td class="memItemLeft" nowrap align=right valign=top><a class="anchor" name="a3" doxytag="constants.h::FishSoundError" ></a>
-typedef enum <a class="el" href="constants_8h.html#a21">_FishSoundError</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a3">FishSoundError</a></td></tr>
+typedef enum <a class="el" href="constants_8h.html#a25">_FishSoundError</a> </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a3">FishSoundError</a></td></tr>
<tr><td class="mdescLeft"> </td><td class="mdescRight">Error values. <br><br></td></tr>
<tr><td colspan=2><br><h2>Enumerations</h2></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a18">_FishSoundMode</a> { <a class="el" href="constants_8h.html#a18a4">FISH_SOUND_DECODE</a> = 0x10,
-<a class="el" href="constants_8h.html#a18a5">FISH_SOUND_ENCODE</a> = 0x20
+<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a22">_FishSoundMode</a> { <a class="el" href="constants_8h.html#a22a4">FISH_SOUND_DECODE</a> = 0x10,
+<a class="el" href="constants_8h.html#a22a5">FISH_SOUND_ENCODE</a> = 0x20
}</td></tr>
-<tr><td class="mdescLeft"> </td><td class="mdescRight">Mode of operation (encode or decode). More...<br><br></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a19">_FishSoundCodecID</a> { <a class="el" href="constants_8h.html#a19a6">FISH_SOUND_UNKNOWN</a> = 0x00,
-<a class="el" href="constants_8h.html#a19a7">FISH_SOUND_VORBIS</a> = 0x01,
-<a class="el" href="constants_8h.html#a19a8">FISH_SOUND_SPEEX</a> = 0x02
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Mode of operation (encode or decode). More...<br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a23">_FishSoundCodecID</a> { <a class="el" href="constants_8h.html#a23a6">FISH_SOUND_UNKNOWN</a> = 0x00,
+<a class="el" href="constants_8h.html#a23a7">FISH_SOUND_VORBIS</a> = 0x01,
+<a class="el" href="constants_8h.html#a23a8">FISH_SOUND_SPEEX</a> = 0x02
}</td></tr>
-<tr><td class="mdescLeft"> </td><td class="mdescRight">Identifiers for supported codecs. More...<br><br></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a20">_FishSoundCommand</a> { <br>
- <a class="el" href="constants_8h.html#a20a9">FISH_SOUND_COMMAND_NOP</a> = 0x0000,
-<a class="el" href="constants_8h.html#a20a10">FISH_SOUND_GET_INFO</a> = 0x1000,
-<a class="el" href="constants_8h.html#a20a11">FISH_SOUND_GET_INTERLEAVE</a> = 0x2000,
-<a class="el" href="constants_8h.html#a20a12">FISH_SOUND_SET_INTERLEAVE</a> = 0x2001,
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Identifiers for supported codecs. More...<br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a24">_FishSoundCommand</a> { <br>
+ <a class="el" href="constants_8h.html#a24a9">FISH_SOUND_COMMAND_NOP</a> = 0x0000,
+<a class="el" href="constants_8h.html#a24a10">FISH_SOUND_GET_INFO</a> = 0x1000,
+<a class="el" href="constants_8h.html#a24a11">FISH_SOUND_GET_INTERLEAVE</a> = 0x2000,
+<a class="el" href="constants_8h.html#a24a12">FISH_SOUND_SET_INTERLEAVE</a> = 0x2001,
<br>
<b>FISH_SOUND_SET_ENCODE_VBR</b> = 0x4000,
<b>FISH_SOUND_COMMAND_MAX</b>
<br>
}</td></tr>
-<tr><td class="mdescLeft"> </td><td class="mdescRight">Command codes. More...<br><br></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a21">_FishSoundError</a> { <a class="el" href="constants_8h.html#a21a15">FISH_SOUND_OK</a> = 0,
-<a class="el" href="constants_8h.html#a21a16">FISH_SOUND_ERR_DISABLED</a> = -10,
-<a class="el" href="constants_8h.html#a21a17">FISH_SOUND_ERR_SHORT_IDENTIFY</a> = -20
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Command codes. More...<br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>enum </td><td class="memItemRight" valign=bottom><a class="el" href="constants_8h.html#a25">_FishSoundError</a> { <br>
+ <a class="el" href="constants_8h.html#a25a15">FISH_SOUND_OK</a> = 0,
+<a class="el" href="constants_8h.html#a25a16">FISH_SOUND_ERR_GENERIC</a> = -1,
+<a class="el" href="constants_8h.html#a25a17">FISH_SOUND_ERR_BAD</a> = -2,
+<a class="el" href="constants_8h.html#a25a18">FISH_SOUND_ERR_INVALID</a> = -3,
+<br>
+ <a class="el" href="constants_8h.html#a25a19">FISH_SOUND_ERR_DISABLED</a> = -10,
+<a class="el" href="constants_8h.html#a25a20">FISH_SOUND_ERR_SHORT_IDENTIFY</a> = -20,
+<a class="el" href="constants_8h.html#a25a21">FISH_SOUND_ERR_COMMENT_INVALID</a> = -21
+<br>
}</td></tr>
-<tr><td class="mdescLeft"> </td><td class="mdescRight">Error values. More...<br><br></td></tr>
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Error values. More...<br><br></td></tr>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
Constants used by libfishsound.
<p>
<hr><h2>Enumeration Type Documentation</h2>
-<a class="anchor" name="a19" doxytag="constants.h::_FishSoundCodecID" ></a><p>
+<a class="anchor" name="a23" doxytag="constants.h::_FishSoundCodecID" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
<td class="mdRow">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a19">_FishSoundCodecID</a>
+ <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a23">_FishSoundCodecID</a>
</table>
</td>
</tr>
@@ -87,24 +94,24 @@
<p>
<dl compact><dt><b>Enumeration values: </b></dt><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><a class="anchor" name="a19a6" doxytag="FISH_SOUND_UNKNOWN" ></a>FISH_SOUND_UNKNOWN</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a23a6" doxytag="FISH_SOUND_UNKNOWN" ></a>FISH_SOUND_UNKNOWN</em> </td><td>
Unknown. </td></tr>
-<tr><td valign=top><a class="anchor" name="a19a7" doxytag="FISH_SOUND_VORBIS" ></a>FISH_SOUND_VORBIS</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a23a7" doxytag="FISH_SOUND_VORBIS" ></a>FISH_SOUND_VORBIS</em> </td><td>
Vorbis. </td></tr>
-<tr><td valign=top><a class="anchor" name="a19a8" doxytag="FISH_SOUND_SPEEX" ></a>FISH_SOUND_SPEEX</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a23a8" doxytag="FISH_SOUND_SPEEX" ></a>FISH_SOUND_SPEEX</em> </td><td>
Speex. </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a class="anchor" name="a20" doxytag="constants.h::_FishSoundCommand" ></a><p>
+<a class="anchor" name="a24" doxytag="constants.h::_FishSoundCommand" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
<td class="mdRow">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a20">_FishSoundCommand</a>
+ <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a24">_FishSoundCommand</a>
</table>
</td>
</tr>
@@ -121,26 +128,26 @@
<p>
<dl compact><dt><b>Enumeration values: </b></dt><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><a class="anchor" name="a20a9" doxytag="FISH_SOUND_COMMAND_NOP" ></a>FISH_SOUND_COMMAND_NOP</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a24a9" doxytag="FISH_SOUND_COMMAND_NOP" ></a>FISH_SOUND_COMMAND_NOP</em> </td><td>
No operation. </td></tr>
-<tr><td valign=top><a class="anchor" name="a20a10" doxytag="FISH_SOUND_GET_INFO" ></a>FISH_SOUND_GET_INFO</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a24a10" doxytag="FISH_SOUND_GET_INFO" ></a>FISH_SOUND_GET_INFO</em> </td><td>
Retrieve the <a class="el" href="structFishSoundInfo.html">FishSoundInfo</a>. </td></tr>
-<tr><td valign=top><a class="anchor" name="a20a11" doxytag="FISH_SOUND_GET_INTERLEAVE" ></a>FISH_SOUND_GET_INTERLEAVE</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a24a11" doxytag="FISH_SOUND_GET_INTERLEAVE" ></a>FISH_SOUND_GET_INTERLEAVE</em> </td><td>
Query if multichannel audio should be interpreted as interleaved. </td></tr>
-<tr><td valign=top><a class="anchor" name="a20a12" doxytag="FISH_SOUND_SET_INTERLEAVE" ></a>FISH_SOUND_SET_INTERLEAVE</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a24a12" doxytag="FISH_SOUND_SET_INTERLEAVE" ></a>FISH_SOUND_SET_INTERLEAVE</em> </td><td>
Set to 1 to interleave, 0 to non-interleave. </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a class="anchor" name="a21" doxytag="constants.h::_FishSoundError" ></a><p>
+<a class="anchor" name="a25" doxytag="constants.h::_FishSoundError" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
<td class="mdRow">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a21">_FishSoundError</a>
+ <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a25">_FishSoundError</a>
</table>
</td>
</tr>
@@ -157,24 +164,32 @@
<p>
<dl compact><dt><b>Enumeration values: </b></dt><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><a class="anchor" name="a21a15" doxytag="FISH_SOUND_OK" ></a>FISH_SOUND_OK</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a25a15" doxytag="FISH_SOUND_OK" ></a>FISH_SOUND_OK</em> </td><td>
No error. </td></tr>
-<tr><td valign=top><a class="anchor" name="a21a16" doxytag="FISH_SOUND_ERR_DISABLED" ></a>FISH_SOUND_ERR_DISABLED</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a25a16" doxytag="FISH_SOUND_ERR_GENERIC" ></a>FISH_SOUND_ERR_GENERIC</em> </td><td>
+generic error </td></tr>
+<tr><td valign=top><a class="anchor" name="a25a17" doxytag="FISH_SOUND_ERR_BAD" ></a>FISH_SOUND_ERR_BAD</em> </td><td>
+Not a valid FishSound* handle. </td></tr>
+<tr><td valign=top><a class="anchor" name="a25a18" doxytag="FISH_SOUND_ERR_INVALID" ></a>FISH_SOUND_ERR_INVALID</em> </td><td>
+The requested operation is not suitable for this FishSound* handle. </td></tr>
+<tr><td valign=top><a class="anchor" name="a25a19" doxytag="FISH_SOUND_ERR_DISABLED" ></a>FISH_SOUND_ERR_DISABLED</em> </td><td>
Functionality disabled at build time. </td></tr>
-<tr><td valign=top><a class="anchor" name="a21a17" doxytag="FISH_SOUND_ERR_SHORT_IDENTIFY" ></a>FISH_SOUND_ERR_SHORT_IDENTIFY</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a25a20" doxytag="FISH_SOUND_ERR_SHORT_IDENTIFY" ></a>FISH_SOUND_ERR_SHORT_IDENTIFY</em> </td><td>
Too few bytes passed to <a class="el" href="fishsound_8h.html#a3">fish_sound_identify()</a>. </td></tr>
+<tr><td valign=top><a class="anchor" name="a25a21" doxytag="FISH_SOUND_ERR_COMMENT_INVALID" ></a>FISH_SOUND_ERR_COMMENT_INVALID</em> </td><td>
+Comment violates VorbisComment restrictions. </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<a class="anchor" name="a18" doxytag="constants.h::_FishSoundMode" ></a><p>
+<a class="anchor" name="a22" doxytag="constants.h::_FishSoundMode" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
<td class="mdRow">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
- <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a18">_FishSoundMode</a>
+ <td class="md" nowrap valign="top"> enum <a class="el" href="constants_8h.html#a22">_FishSoundMode</a>
</table>
</td>
</tr>
@@ -191,17 +206,18 @@
<p>
<dl compact><dt><b>Enumeration values: </b></dt><dd>
<table border=0 cellspacing=2 cellpadding=0>
-<tr><td valign=top><a class="anchor" name="a18a4" doxytag="FISH_SOUND_DECODE" ></a>FISH_SOUND_DECODE</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a22a4" doxytag="FISH_SOUND_DECODE" ></a>FISH_SOUND_DECODE</em> </td><td>
Decode. </td></tr>
-<tr><td valign=top><a class="anchor" name="a18a5" doxytag="FISH_SOUND_ENCODE" ></a>FISH_SOUND_ENCODE</em> </td><td>
+<tr><td valign=top><a class="anchor" name="a22a5" doxytag="FISH_SOUND_ENCODE" ></a>FISH_SOUND_ENCODE</em> </td><td>
Encode. </td></tr>
</table>
</dl>
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/doxygen.css
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/doxygen.css 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/doxygen.css 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,86 +1,44 @@
H1 {
text-align: center;
- font-family: Geneva, Arial, Helvetica, sans-serif;
+ font-family: Arial, Helvetica, sans-serif;
}
H2 {
font-family: Geneva, Arial, Helvetica, sans-serif;
}
CAPTION { font-weight: bold }
-DIV.qindex {
- width: 100%;
- background-color: #eeeeff;
- border: 1px solid #B0B0B0;
- text-align: center;
- margin: 2px;
- padding: 2px;
- line-height: 120%;
+DIV.qindex { width: 100%;
+ background-color: #eeeeff;
+ border: 4px solid #eeeeff;
+ text-align: center;
+ margin-bottom: 2px
}
-A.qindex {
- text-decoration: none;
- font-weight: bold;
- color: #1A419D;
- padding: 2px;
-}
-A.qindex:visited {
- text-decoration: none;
- font-weight: bold;
- color: #1A419D
- padding: 2px;
-}
-A.qindex:hover {
- text-decoration: none;
- background-color: #ddddff;
- padding: 2px;
-}
-A.qindexHL {
- text-decoration: none;
- font-weight: bold;
- background-color: #6666cc;
- color: #ffffff;
- padding: 2px 6px;
- border: 1px double #9295C2;
-}
-A.qindexHL:hover {
- text-decoration: none;
- background-color: #6666cc;
- color: #ffffff;
- padding: 2px 6px;
-}
+A.qindex { text-decoration: none; font-weight: bold; color: #0000ee }
+A.qindex:visited { text-decoration: none; font-weight: bold; color: #0000ee }
+A.qindex:hover { text-decoration: none; background-color: #ddddff }
+A.qindexHL { text-decoration: none; font-weight: bold;
+ background-color: #6666cc;
+ color: #ffffff
+ }
+A.qindexHL:hover { text-decoration: none; background-color: #6666cc; color: #ffffff }
A.qindexHL:visited { text-decoration: none; background-color: #6666cc; color: #ffffff }
A.el { text-decoration: none; font-weight: bold }
A.elRef { font-weight: bold }
-A.code { text-decoration: none; font-weight: normal; color: #1A419D}
-A.codeRef { font-weight: normal; color: #1A419D}
+A.code { text-decoration: none; font-weight: normal; color: #4444ee }
+A.codeRef { font-weight: normal; color: #4444ee }
A:hover { text-decoration: none; background-color: #f2f2ff }
DL.el { margin-left: -1cm }
-PRE.fragment {
- border: 1px solid #CCCCCC;
- background-color: #f5f5f5;
- margin-top: 4px;
- margin-bottom: 4px;
- margin-left: 2px;
- margin-right: 8px;
- padding-left: 6px;
- padding-right: 6px;
- padding-top: 4px;
- padding-bottom: 4px;
-}
DIV.fragment {
+ width: 98%;
border: 1px solid #CCCCCC;
background-color: #f5f5f5;
- padding: 6px;
+ padding-left: 4px;
+ margin: 4px;
}
DIV.ah { background-color: black; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
-TD.md { background-color: #F4F4FB; font-weight: bold; }
-TD.mdname1 { background-color: #F4F4FB; font-weight: bold; color: #602020; }
-TD.mdname { background-color: #F4F4FB; font-weight: bold; color: #602020; width: 600px; }
-DIV.groupHeader {
- margin-left: 16px;
- margin-top: 12px;
- margin-bottom: 6px;
- font-weight: bold;
- font-family: Geneva, Arial, Helvetica, sans-serif;
-}
+TD.md { background-color: #f2f2ff; font-weight: bold; }
+TD.mdname1 { background-color: #f2f2ff; font-weight: bold; color: #602020; }
+TD.mdname { background-color: #f2f2ff; font-weight: bold; color: #602020; width: 600px; }
+DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold }
DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
BODY {
background: white;
@@ -88,31 +46,29 @@
margin-right: 20px;
margin-left: 20px;
}
-TD.indexkey {
- background-color: #eeeeff;
- font-weight: bold;
- padding-right : 10px;
- padding-top : 2px;
- padding-left : 10px;
- padding-bottom : 2px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 2px;
- margin-bottom : 2px;
- border: 1px solid #CCCCCC;
+TD.indexkey {
+ background-color: #eeeeff;
+ font-weight: bold;
+ padding-right : 10px;
+ padding-top : 2px;
+ padding-left : 10px;
+ padding-bottom : 2px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 2px;
+ margin-bottom : 2px
}
-TD.indexvalue {
- background-color: #eeeeff;
- font-style: italic;
- padding-right : 10px;
- padding-top : 2px;
- padding-left : 10px;
- padding-bottom : 2px;
- margin-left : 0px;
- margin-right : 0px;
- margin-top : 2px;
- margin-bottom : 2px;
- border: 1px solid #CCCCCC;
+TD.indexvalue {
+ background-color: #eeeeff;
+ font-style: italic;
+ padding-right : 10px;
+ padding-top : 2px;
+ padding-left : 10px;
+ padding-bottom : 2px;
+ margin-left : 0px;
+ margin-right : 0px;
+ margin-top : 2px;
+ margin-bottom : 2px
}
TR.memlist {
background-color: #f0f0f0;
@@ -129,14 +85,14 @@
SPAN.charliteral { color: #008080 }
.mdTable {
border: 1px solid #868686;
- background-color: #F4F4FB;
+ background-color: #f2f2ff;
}
.mdRow {
- padding: 8px 10px;
+ padding: 8px 20px;
}
.mdescLeft {
font-size: smaller;
- font-style: italic;
+ font-family: Arial, Helvetica, sans-serif;
background-color: #FAFAFA;
padding-left: 8px;
border-top: 1px none #E0E0E0;
@@ -147,6 +103,7 @@
}
.mdescRight {
font-size: smaller;
+ font-family: Arial, Helvetica, sans-serif;
font-style: italic;
background-color: #FAFAFA;
padding-left: 4px;
@@ -196,7 +153,7 @@
font-family: Geneva, Arial, Helvetica, sans-serif;
font-size: 13px;
}
-.search { color: #003399;
+.search { color: #0000ee;
font-weight: bold;
}
FORM.search {
@@ -210,9 +167,3 @@
}
TD.tiny { font-size: 75%;
}
-a {
- color: #252E78;
-}
-a:visited {
- color: #3D2185;
-}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/files.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/files.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/files.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,14 +3,16 @@
<title>libfishsound: File Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindexHL" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>libfishsound File List</h1>Here is a list of all documented files with brief descriptions:<table>
+ <tr><td class="indexkey"><a class="el" href="comments_8h.html">comments.h</a> [code]</td><td class="indexvalue">Encoding and decoding of comments </td></tr>
<tr><td class="indexkey"><a class="el" href="constants_8h.html">constants.h</a> [code]</td><td class="indexvalue">Constants used by libfishsound </td></tr>
<tr><td class="indexkey"><a class="el" href="fishsound_8h.html">fishsound.h</a> [code]</td><td class="indexvalue">The libfishsound C API </td></tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h-source.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h-source.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h-source.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: fishsound.h Source File</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>fishsound.h</h1>Go to the documentation of this file.<div class="fragment"><pre>00001 <span class="comment">/*</span>
00002 <span class="comment"> Copyright (C) 2003 Commonwealth Scientific and Industrial Research</span>
@@ -42,63 +42,81 @@
00035 <span class="preprocessor"></span>
00036 <span class="preprocessor">#include <<a class="code" href="constants_8h.html">fishsound/constants.h</a>></span>
00037
-<a name="l00384"></a><a class="code" href="structFishSoundInfo.html">00384</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-<a name="l00386"></a><a class="code" href="structFishSoundInfo.html#o0">00386</a> <span class="keywordtype">int</span> samplerate;
-00387
-<a name="l00389"></a><a class="code" href="structFishSoundInfo.html#o1">00389</a> <span class="keywordtype">int</span> channels;
-00390
-<a name="l00392"></a><a class="code" href="structFishSoundInfo.html#o2">00392</a> <span class="keywordtype">int</span> format;
-00393 } <a class="code" href="structFishSoundInfo.html">FishSoundInfo</a>;
+<a name="l00388"></a><a class="code" href="structFishSoundInfo.html">00388</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00390"></a><a class="code" href="structFishSoundInfo.html#o0">00390</a> <span class="keywordtype">int</span> samplerate;
+00391
+<a name="l00393"></a><a class="code" href="structFishSoundInfo.html#o1">00393</a> <span class="keywordtype">int</span> channels;
00394
-<a name="l00398"></a><a class="code" href="structFishSoundFormat.html">00398</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
-<a name="l00400"></a><a class="code" href="structFishSoundFormat.html#o0">00400</a> <span class="keywordtype">int</span> format;
-00401
-<a name="l00403"></a><a class="code" href="structFishSoundFormat.html#o1">00403</a> <span class="keyword">const</span> <span class="keywordtype">char</span> * name;
-00404
-<a name="l00406"></a><a class="code" href="structFishSoundFormat.html#o2">00406</a> <span class="keyword">const</span> <span class="keywordtype">char</span> * extension;
-00407 } <a class="code" href="structFishSoundFormat.html">FishSoundFormat</a>;
+<a name="l00396"></a><a class="code" href="structFishSoundInfo.html#o2">00396</a> <span class="keywordtype">int</span> format;
+00397 } <a class="code" href="structFishSoundInfo.html">FishSoundInfo</a>;
+00398
+<a name="l00402"></a><a class="code" href="structFishSoundFormat.html">00402</a> <span class="keyword">typedef</span> <span class="keyword">struct </span>{
+<a name="l00404"></a><a class="code" href="structFishSoundFormat.html#o0">00404</a> <span class="keywordtype">int</span> format;
+00405
+<a name="l00407"></a><a class="code" href="structFishSoundFormat.html#o1">00407</a> <span class="keyword">const</span> <span class="keywordtype">char</span> * name;
00408
-<a name="l00413"></a><a class="code" href="fishsound_8h.html#a0">00413</a> <span class="keyword">typedef</span> <span class="keywordtype">void</span> * <a class="code" href="fishsound_8h.html#a0">FishSound</a>;
-00414
-<a name="l00426"></a><a class="code" href="fishsound_8h.html#a1">00426</a> <span class="keyword">typedef</span> int (*<a class="code" href="fishsound_8h.html#a1">FishSoundDecoded</a>) (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">float</span> ** pcm,
-00427 <span class="keywordtype">long</span> frames, <span class="keywordtype">void</span> * user_data);
-00428
-<a name="l00440"></a><a class="code" href="fishsound_8h.html#a2">00440</a> <span class="keyword">typedef</span> int (*<a class="code" href="fishsound_8h.html#a2">FishSoundEncoded</a>) (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> * buf,
-00441 <span class="keywordtype">long</span> bytes, <span class="keywordtype">void</span> * user_data);
-00442
-00459 <span class="keywordtype">int</span>
-00460 <a class="code" href="fishsound_8h.html#a3">fish_sound_identify</a> (<span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> * buf, <span class="keywordtype">long</span> bytes);
-00461
-00468 <a class="code" href="fishsound_8h.html#a0">FishSound</a> * <a class="code" href="fishsound_8h.html#a4">fish_sound_new</a> (<span class="keywordtype">int</span> mode, <a class="code" href="structFishSoundInfo.html">FishSoundInfo</a> * fsinfo);
+<a name="l00410"></a><a class="code" href="structFishSoundFormat.html#o2">00410</a> <span class="keyword">const</span> <span class="keywordtype">char</span> * extension;
+00411 } <a class="code" href="structFishSoundFormat.html">FishSoundFormat</a>;
+00412
+<a name="l00417"></a><a class="code" href="fishsound_8h.html#a0">00417</a> <span class="keyword">typedef</span> <span class="keywordtype">void</span> * <a class="code" href="fishsound_8h.html#a0">FishSound</a>;
+00418
+<a name="l00430"></a><a class="code" href="fishsound_8h.html#a1">00430</a> <span class="keyword">typedef</span> int (*<a class="code" href="fishsound_8h.html#a1">FishSoundDecoded</a>) (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">float</span> ** pcm,
+00431 <span class="keywordtype">long</span> frames, <span class="keywordtype">void</span> * user_data);
+00432
+<a name="l00444"></a><a class="code" href="fishsound_8h.html#a2">00444</a> <span class="keyword">typedef</span> int (*<a class="code" href="fishsound_8h.html#a2">FishSoundEncoded</a>) (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> * buf,
+00445 <span class="keywordtype">long</span> bytes, <span class="keywordtype">void</span> * user_data);
+00446
+00447 <span class="preprocessor">#ifdef __cplusplus</span>
+00448 <span class="preprocessor"></span><span class="keyword">extern</span> <span class="stringliteral">"C"</span> {
+00449 <span class="preprocessor">#endif</span>
+00450 <span class="preprocessor"></span>
+00467 <span class="keywordtype">int</span>
+00468 <a class="code" href="fishsound_8h.html#a3">fish_sound_identify</a> (<span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> * buf, <span class="keywordtype">long</span> bytes);
00469
-00478 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a5">fish_sound_set_decoded_callback</a> (FishSound * fsound,
-00479 <a class="code" href="fishsound_8h.html#a1">FishSoundDecoded</a> decoded,
-00480 <span class="keywordtype">void</span> * user_data);
-00481
-00490 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a6">fish_sound_set_encoded_callback</a> (FishSound * fsound,
-00491 <a class="code" href="fishsound_8h.html#a2">FishSoundEncoded</a> encoded,
-00492 <span class="keywordtype">void</span> * user_data);
-00493
-00501 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a7">fish_sound_decode</a> (FishSound * fsound, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> * buf, <span class="keywordtype">long</span> bytes);
-00502
-00512 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a8">fish_sound_encode</a> (FishSound * fsound, <span class="keywordtype">float</span> ** pcm, <span class="keywordtype">long</span> frames);
-00513
-00519 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a9">fish_sound_flush</a> (FishSound * fsound);
-00520
-00526 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a10">fish_sound_reset</a> (FishSound * fsound);
-00527
-00533 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a11">fish_sound_delete</a> (FishSound * fsound);
-00534
-00543 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a12">fish_sound_command</a> (FishSound * fsound, <span class="keywordtype">int</span> command, <span class="keywordtype">void</span> * data,
-00544 <span class="keywordtype">int</span> datasize);
-00545
-00553 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a13">fish_sound_get_interleave</a> (FishSound * fsound);
-00554
-00564 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a14">fish_sound_set_interleave</a> (FishSound * fsound, <span class="keywordtype">int</span> interleave);
-00565
-00566 <span class="preprocessor">#endif </span><span class="comment">/* __FISH_SOUND_H__ */</span>
-</pre></div><hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+00476 <a class="code" href="fishsound_8h.html#a0">FishSound</a> * <a class="code" href="fishsound_8h.html#a4">fish_sound_new</a> (<span class="keywordtype">int</span> mode, <a class="code" href="structFishSoundInfo.html">FishSoundInfo</a> * fsinfo);
+00477
+00486 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a5">fish_sound_set_decoded_callback</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound,
+00487 <a class="code" href="fishsound_8h.html#a1">FishSoundDecoded</a> decoded,
+00488 <span class="keywordtype">void</span> * user_data);
+00489
+00498 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a6">fish_sound_set_encoded_callback</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound,
+00499 <a class="code" href="fishsound_8h.html#a2">FishSoundEncoded</a> encoded,
+00500 <span class="keywordtype">void</span> * user_data);
+00501
+00509 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a7">fish_sound_decode</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> * buf, <span class="keywordtype">long</span> bytes);
+00510
+00520 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a8">fish_sound_encode</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">float</span> ** pcm, <span class="keywordtype">long</span> frames);
+00521
+00527 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a9">fish_sound_flush</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00528
+00538 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a10">fish_sound_reset</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00539
+00545 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a11">fish_sound_delete</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00546
+00555 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a12">fish_sound_command</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">int</span> command, <span class="keywordtype">void</span> * data,
+00556 <span class="keywordtype">int</span> datasize);
+00557
+00565 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a13">fish_sound_get_interleave</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00566
+00576 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a14">fish_sound_set_interleave</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">int</span> interleave);
+00577
+00595 <span class="keywordtype">long</span> <a class="code" href="fishsound_8h.html#a15">fish_sound_get_frameno</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound);
+00596
+00610 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a16">fish_sound_set_frameno</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">long</span> frameno);
+00611
+00642 <span class="keywordtype">int</span> <a class="code" href="fishsound_8h.html#a17">fish_sound_prepare_truncation</a> (<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound, <span class="keywordtype">long</span> next_granulepos,
+00643 <span class="keywordtype">int</span> next_eos);
+00644
+00645 <span class="preprocessor">#ifdef __cplusplus</span>
+00646 <span class="preprocessor"></span>}
+00647 <span class="preprocessor">#endif</span>
+00648 <span class="preprocessor"></span>
+00649 <span class="preprocessor">#include <<a class="code" href="comments_8h.html">fishsound/comments.h</a>></span>
+00650
+00651 <span class="preprocessor">#endif </span><span class="comment">/* __FISH_SOUND_H__ */</span>
+</pre></div><hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/fishsound_8h.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,23 +3,24 @@
<title>libfishsound: fishsound.h File Reference</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>fishsound.h File Reference</h1>The libfishsound C API.
<a href="#_details">More...</a>
<p>
<code>#include <<a class="el" href="constants_8h-source.html">fishsound/constants.h</a>></code><br>
+<code>#include <<a class="el" href="comments_8h-source.html">fishsound/comments.h</a>></code><br>
<p>
<a href="fishsound_8h-source.html">Go to the source code of this file.</a><table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr>
<tr><td colspan=2><br><h2>Data Structures</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>struct </td><td class="memItemRight" valign=bottom><a class="el" href="structFishSoundFormat.html">FishSoundFormat</a></td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Info about a particular sound format. </em> More...<br><br></td></tr>
<tr><td class="memItemLeft" nowrap align=right valign=top>struct </td><td class="memItemRight" valign=bottom><a class="el" href="structFishSoundInfo.html">FishSoundInfo</a></td></tr>
<tr><td class="mdescLeft"> </td><td class="mdescRight">Info about a particular encoder/decoder instance. </em> More...<br><br></td></tr>
-<tr><td class="memItemLeft" nowrap align=right valign=top>struct </td><td class="memItemRight" valign=bottom><a class="el" href="structFishSoundFormat.html">FishSoundFormat</a></td></tr>
-
-<tr><td class="mdescLeft"> </td><td class="mdescRight">Info about a particular sound format. </em> More...<br><br></td></tr>
<tr><td colspan=2><br><h2>Typedefs</h2></td></tr>
<tr><td class="memItemLeft" nowrap align=right valign=top>typedef void * </td><td class="memItemRight" valign=bottom><a class="el" href="fishsound_8h.html#a0">FishSound</a></td></tr>
@@ -67,6 +68,15 @@
<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="fishsound_8h.html#a14">fish_sound_set_interleave</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, int interleave)</td></tr>
<tr><td class="mdescLeft"> </td><td class="mdescRight">Set the PCM format used by a FishSound object. <a href="#a14"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>long </td><td class="memItemRight" valign=bottom><a class="el" href="fishsound_8h.html#a15">fish_sound_get_frameno</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Query the current frame number of a FishSound object. <a href="#a15"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="fishsound_8h.html#a16">fish_sound_set_frameno</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, long frameno)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Set the current frame number of a FishSound object. <a href="#a16"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>int </td><td class="memItemRight" valign=bottom><a class="el" href="fishsound_8h.html#a17">fish_sound_prepare_truncation</a> (<a class="el" href="fishsound_8h.html#a0">FishSound</a> *fsound, long next_granulepos, int next_eos)</td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">Prepare truncation details for the next block of data. <a href="#a17"></a><br><br></td></tr>
</table>
<hr><a name="_details"></a><h2>Detailed Description</h2>
The libfishsound C API.
@@ -191,20 +201,20 @@
<td class="mdname" nowrap> fsound</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>int </td>
<td class="mdname" nowrap> command</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>void * </td>
<td class="mdname" nowrap> data</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>int </td>
<td class="mdname" nowrap> datasize</em></td>
</tr>
@@ -252,14 +262,14 @@
<td class="mdname" nowrap> fsound</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>unsigned char * </td>
<td class="mdname" nowrap> buf</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>long </td>
<td class="mdname" nowrap> bytes</em></td>
</tr>
@@ -343,14 +353,14 @@
<td class="mdname" nowrap> fsound</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>float ** </td>
<td class="mdname" nowrap> pcm</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>long </td>
<td class="mdname" nowrap> frames</em></td>
</tr>
@@ -423,6 +433,50 @@
</td>
</tr>
</table>
+<a class="anchor" name="a15" doxytag="fishsound.h::fish_sound_get_frameno" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> long fish_sound_get_frameno </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname1" valign="top" nowrap> fsound</em> </td>
+ <td class="md" valign="top"> ) </td>
+ <td class="md" nowrap></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Query the current frame number of a FishSound object.
+<p>
+For decoding, this is the greatest frame index that has been decoded and made available to a FishSoundDecoded callback. This function is safe to call from within a FishSoundDecoded callback, and corresponds to the frame number of the last frame in the current decoded block.<p>
+For encoding, this is the greatest frame index that has been encoded. This function is safe to call from within a FishSoundEncoded callback, and corresponds to the frame number of the last frame encoded in the current block.<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Returns:</b></dt><dd>The current frame number </dd></dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>-1</em> </td><td>Invalid <em>fsound</em> </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
<a class="anchor" name="a13" doxytag="fishsound.h::fish_sound_get_interleave" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
@@ -478,8 +532,8 @@
<td class="mdname" nowrap> buf</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>long </td>
<td class="mdname" nowrap> bytes</em></td>
</tr>
@@ -533,8 +587,8 @@
<td class="mdname" nowrap> mode</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap><a class="el" href="structFishSoundInfo.html">FishSoundInfo</a> * </td>
<td class="mdname" nowrap> fsinfo</em></td>
</tr>
@@ -568,6 +622,68 @@
</td>
</tr>
</table>
+<a class="anchor" name="a17" doxytag="fishsound.h::fish_sound_prepare_truncation" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> int fish_sound_prepare_truncation </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>long </td>
+ <td class="mdname" nowrap> next_granulepos</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>int </td>
+ <td class="mdname" nowrap> next_eos</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Prepare truncation details for the next block of data.
+<p>
+The semantics of these parameters derives directly from Ogg encapsulation of Vorbis, described here.<p>
+When decoding from Ogg, you should call this function with the granulepos</em> and <em>eos</em> of the <em>ogg_packet</em> structure. This call should be made before passing the packet's data to <a class="el" href="fishsound_8h.html#a7">fish_sound_decode()</a>. Failure to do so may result in minor decode errors on the first and/or last packet of the stream.<p>
+When encoding into Ogg, you should call this function with the granulepos</em> and <em>eos</em> that will be used for the <em>ogg_packet</em> structure. This call should be made before passing the block of audio data to <a class="el" href="fishsound_8h.html#a8">fish_sound_encode()</a>. Failure to do so may result in minor encoding errors on the first and/or last packet of the stream.<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ <tr><td valign=top>next_granulepos</em> </td><td>The "granulepos" for the next block to decode. If unknown, set <em>next_granulepos</em> to -1. Otherwise, <em>next_granulepos</em> specifies the frameno of the final frame in the block. This is authoritative, hence can be used to indicate various forms of truncation at the beginning or end of a stream. Mid-stream, a later-than-expected "granulepos" indicates that some data was missing. </td></tr>
+ <tr><td valign=top>next_eos</em> </td><td>A boolean indicating whether the next data block will be the last in the stream. </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>0</em> </td><td>Success </td></tr>
+ <tr><td valign=top>-1</em> </td><td>Invalid <em>fsound</em> </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
<a class="anchor" name="a10" doxytag="fishsound.h::fish_sound_reset" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
@@ -596,6 +712,7 @@
<p>
Reset the codec state of a FishSound object.
<p>
+When decoding from a seekable file, <a class="el" href="fishsound_8h.html#a10">fish_sound_reset()</a> should be called after any seek operations. See also <a class="el" href="fishsound_8h.html#a16">fish_sound_set_frameno()</a>.<p>
<dl compact><dt><b>Parameters:</b></dt><dd>
<table border="0" cellspacing="2" cellpadding="0">
<tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
@@ -617,14 +734,14 @@
<td class="mdname" nowrap> fsound</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap><a class="el" href="fishsound_8h.html#a1">FishSoundDecoded</a> </td>
<td class="mdname" nowrap> decoded</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>void * </td>
<td class="mdname" nowrap> user_data</em></td>
</tr>
@@ -671,14 +788,14 @@
<td class="mdname" nowrap> fsound</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap><a class="el" href="fishsound_8h.html#a2">FishSoundEncoded</a> </td>
<td class="mdname" nowrap> encoded</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>void * </td>
<td class="mdname" nowrap> user_data</em></td>
</tr>
@@ -713,6 +830,59 @@
</td>
</tr>
</table>
+<a class="anchor" name="a16" doxytag="fishsound.h::fish_sound_set_frameno" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> int fish_sound_set_frameno </td>
+ <td class="md" valign="top">( </td>
+ <td class="md" nowrap valign="top"><a class="el" href="fishsound_8h.html#a0">FishSound</a> * </td>
+ <td class="mdname" nowrap> fsound</em>, </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ <td class="md" nowrap>long </td>
+ <td class="mdname" nowrap> frameno</em></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td class="md">) </td>
+ <td class="md" colspan="2"></td>
+ </tr>
+
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+Set the current frame number of a FishSound object.
+<p>
+When decoding from a seekable file, <a class="el" href="fishsound_8h.html#a16">fish_sound_set_frameno()</a> should be called after any seek operations, otherwise the value returned by <a class="el" href="fishsound_8h.html#a15">fish_sound_get_frameno()</a> will simply continue to increment. See also <a class="el" href="fishsound_8h.html#a10">fish_sound_reset()</a>.<p>
+<dl compact><dt><b>Parameters:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>fsound</em> </td><td>A FishSound* handle </td></tr>
+ <tr><td valign=top>frameno</em> </td><td>The current frame number. </td></tr>
+ </table>
+</dl>
+<dl compact><dt><b>Return values:</b></dt><dd>
+ <table border="0" cellspacing="2" cellpadding="0">
+ <tr><td valign=top>0</em> </td><td>Success </td></tr>
+ <tr><td valign=top>-1</em> </td><td>Invalid <em>fsound</em> </td></tr>
+ </table>
+</dl>
+ </td>
+ </tr>
+</table>
<a class="anchor" name="a14" doxytag="fishsound.h::fish_sound_set_interleave" ></a><p>
<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
<tr>
@@ -725,8 +895,8 @@
<td class="mdname" nowrap> fsound</em>, </td>
</tr>
<tr>
- <td class="md" nowrap align="right"></td>
<td></td>
+ <td></td>
<td class="md" nowrap>int </td>
<td class="mdname" nowrap> interleave</em></td>
</tr>
@@ -765,8 +935,9 @@
</td>
</tr>
</table>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Compound Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindexHL" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindexHL" href="functions.html">All</a> | <a class="qindex" href="functions_vars.html">Variables</a></div>
@@ -13,10 +13,12 @@
: <a class="el" href="structFishSoundInfo.html#o1">FishSoundInfo</a><li>extension
: <a class="el" href="structFishSoundFormat.html#o2">FishSoundFormat</a><li>format
: <a class="el" href="structFishSoundFormat.html#o0">FishSoundFormat</a>, <a class="el" href="structFishSoundInfo.html#o2">FishSoundInfo</a><li>name
-: <a class="el" href="structFishSoundFormat.html#o1">FishSoundFormat</a><li>samplerate
-: <a class="el" href="structFishSoundInfo.html#o0">FishSoundInfo</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+: <a class="el" href="structFishSoundFormat.html#o1">FishSoundFormat</a>, <a class="el" href="structFishSoundComment.html#o0">FishSoundComment</a><li>samplerate
+: <a class="el" href="structFishSoundInfo.html#o0">FishSoundInfo</a><li>value
+: <a class="el" href="structFishSoundComment.html#o1">FishSoundComment</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions_vars.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions_vars.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/functions_vars.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Compound Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindexHL" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindex" href="functions.html">All</a> | <a class="qindexHL" href="functions_vars.html">Variables</a></div>
@@ -13,10 +13,12 @@
: <a class="el" href="structFishSoundInfo.html#o1">FishSoundInfo</a><li>extension
: <a class="el" href="structFishSoundFormat.html#o2">FishSoundFormat</a><li>format
: <a class="el" href="structFishSoundFormat.html#o0">FishSoundFormat</a>, <a class="el" href="structFishSoundInfo.html#o2">FishSoundInfo</a><li>name
-: <a class="el" href="structFishSoundFormat.html#o1">FishSoundFormat</a><li>samplerate
-: <a class="el" href="structFishSoundInfo.html#o0">FishSoundInfo</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+: <a class="el" href="structFishSoundFormat.html#o1">FishSoundFormat</a>, <a class="el" href="structFishSoundComment.html#o0">FishSoundComment</a><li>samplerate
+: <a class="el" href="structFishSoundInfo.html#o0">FishSoundInfo</a><li>value
+: <a class="el" href="structFishSoundComment.html#o1">FishSoundComment</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: File Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindexHL" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration values</a></div>
<div class="qindex"><a class="qindex" href="#index__">_</a> | <a class="qindex" href="#index_f">f</a></div>
@@ -13,36 +13,52 @@
<p>
Here is a list of all documented functions, variables, defines, enums, and typedefs with links to the documentation:<h3><a class="anchor" name="index__">- _ -</a></h3><ul>
<li>_FishSoundCodecID
-: <a class="el" href="constants_8h.html#a19">constants.h</a><li>_FishSoundCommand
-: <a class="el" href="constants_8h.html#a20">constants.h</a><li>_FishSoundError
-: <a class="el" href="constants_8h.html#a21">constants.h</a><li>_FishSoundMode
-: <a class="el" href="constants_8h.html#a18">constants.h</a></ul>
+: <a class="el" href="constants_8h.html#a23">constants.h</a><li>_FishSoundCommand
+: <a class="el" href="constants_8h.html#a24">constants.h</a><li>_FishSoundError
+: <a class="el" href="constants_8h.html#a25">constants.h</a><li>_FishSoundMode
+: <a class="el" href="constants_8h.html#a22">constants.h</a></ul>
<h3><a class="anchor" name="index_f">- f -</a></h3><ul>
<li>fish_sound_command()
: <a class="el" href="fishsound_8h.html#a12">fishsound.h</a><li>FISH_SOUND_COMMAND_NOP
-: <a class="el" href="constants_8h.html#a20a9">constants.h</a><li>fish_sound_decode()
-: <a class="el" href="fishsound_8h.html#a7">fishsound.h</a><li>FISH_SOUND_DECODE
-: <a class="el" href="constants_8h.html#a18a4">constants.h</a><li>fish_sound_delete()
+: <a class="el" href="constants_8h.html#a24a9">constants.h</a><li>fish_sound_comment_add()
+: <a class="el" href="comments_8h.html#a5">comments.h</a><li>fish_sound_comment_add_byname()
+: <a class="el" href="comments_8h.html#a6">comments.h</a><li>fish_sound_comment_first()
+: <a class="el" href="comments_8h.html#a1">comments.h</a><li>fish_sound_comment_first_byname()
+: <a class="el" href="comments_8h.html#a3">comments.h</a><li>fish_sound_comment_get_vendor()
+: <a class="el" href="comments_8h.html#a0">comments.h</a><li>fish_sound_comment_next()
+: <a class="el" href="comments_8h.html#a2">comments.h</a><li>fish_sound_comment_next_byname()
+: <a class="el" href="comments_8h.html#a4">comments.h</a><li>fish_sound_comment_remove()
+: <a class="el" href="comments_8h.html#a7">comments.h</a><li>fish_sound_comment_remove_byname()
+: <a class="el" href="comments_8h.html#a8">comments.h</a><li>FISH_SOUND_DECODE
+: <a class="el" href="constants_8h.html#a22a4">constants.h</a><li>fish_sound_decode()
+: <a class="el" href="fishsound_8h.html#a7">fishsound.h</a><li>fish_sound_delete()
: <a class="el" href="fishsound_8h.html#a11">fishsound.h</a><li>FISH_SOUND_ENCODE
-: <a class="el" href="constants_8h.html#a18a5">constants.h</a><li>fish_sound_encode()
-: <a class="el" href="fishsound_8h.html#a8">fishsound.h</a><li>FISH_SOUND_ERR_DISABLED
-: <a class="el" href="constants_8h.html#a21a16">constants.h</a><li>FISH_SOUND_ERR_SHORT_IDENTIFY
-: <a class="el" href="constants_8h.html#a21a17">constants.h</a><li>fish_sound_flush()
-: <a class="el" href="fishsound_8h.html#a9">fishsound.h</a><li>FISH_SOUND_GET_INFO
-: <a class="el" href="constants_8h.html#a20a10">constants.h</a><li>fish_sound_get_interleave()
-: <a class="el" href="fishsound_8h.html#a13">fishsound.h</a><li>FISH_SOUND_GET_INTERLEAVE
-: <a class="el" href="constants_8h.html#a20a11">constants.h</a><li>fish_sound_identify()
+: <a class="el" href="constants_8h.html#a22a5">constants.h</a><li>fish_sound_encode()
+: <a class="el" href="fishsound_8h.html#a8">fishsound.h</a><li>FISH_SOUND_ERR_BAD
+: <a class="el" href="constants_8h.html#a25a17">constants.h</a><li>FISH_SOUND_ERR_COMMENT_INVALID
+: <a class="el" href="constants_8h.html#a25a21">constants.h</a><li>FISH_SOUND_ERR_DISABLED
+: <a class="el" href="constants_8h.html#a25a19">constants.h</a><li>FISH_SOUND_ERR_GENERIC
+: <a class="el" href="constants_8h.html#a25a16">constants.h</a><li>FISH_SOUND_ERR_INVALID
+: <a class="el" href="constants_8h.html#a25a18">constants.h</a><li>FISH_SOUND_ERR_SHORT_IDENTIFY
+: <a class="el" href="constants_8h.html#a25a20">constants.h</a><li>fish_sound_flush()
+: <a class="el" href="fishsound_8h.html#a9">fishsound.h</a><li>fish_sound_get_frameno()
+: <a class="el" href="fishsound_8h.html#a15">fishsound.h</a><li>FISH_SOUND_GET_INFO
+: <a class="el" href="constants_8h.html#a24a10">constants.h</a><li>FISH_SOUND_GET_INTERLEAVE
+: <a class="el" href="constants_8h.html#a24a11">constants.h</a><li>fish_sound_get_interleave()
+: <a class="el" href="fishsound_8h.html#a13">fishsound.h</a><li>fish_sound_identify()
: <a class="el" href="fishsound_8h.html#a3">fishsound.h</a><li>fish_sound_new()
: <a class="el" href="fishsound_8h.html#a4">fishsound.h</a><li>FISH_SOUND_OK
-: <a class="el" href="constants_8h.html#a21a15">constants.h</a><li>fish_sound_reset()
+: <a class="el" href="constants_8h.html#a25a15">constants.h</a><li>fish_sound_prepare_truncation()
+: <a class="el" href="fishsound_8h.html#a17">fishsound.h</a><li>fish_sound_reset()
: <a class="el" href="fishsound_8h.html#a10">fishsound.h</a><li>fish_sound_set_decoded_callback()
: <a class="el" href="fishsound_8h.html#a5">fishsound.h</a><li>fish_sound_set_encoded_callback()
-: <a class="el" href="fishsound_8h.html#a6">fishsound.h</a><li>fish_sound_set_interleave()
+: <a class="el" href="fishsound_8h.html#a6">fishsound.h</a><li>fish_sound_set_frameno()
+: <a class="el" href="fishsound_8h.html#a16">fishsound.h</a><li>fish_sound_set_interleave()
: <a class="el" href="fishsound_8h.html#a14">fishsound.h</a><li>FISH_SOUND_SET_INTERLEAVE
-: <a class="el" href="constants_8h.html#a20a12">constants.h</a><li>FISH_SOUND_SPEEX
-: <a class="el" href="constants_8h.html#a19a8">constants.h</a><li>FISH_SOUND_UNKNOWN
-: <a class="el" href="constants_8h.html#a19a6">constants.h</a><li>FISH_SOUND_VORBIS
-: <a class="el" href="constants_8h.html#a19a7">constants.h</a><li>FishSound
+: <a class="el" href="constants_8h.html#a24a12">constants.h</a><li>FISH_SOUND_SPEEX
+: <a class="el" href="constants_8h.html#a23a8">constants.h</a><li>FISH_SOUND_UNKNOWN
+: <a class="el" href="constants_8h.html#a23a6">constants.h</a><li>FISH_SOUND_VORBIS
+: <a class="el" href="constants_8h.html#a23a7">constants.h</a><li>FishSound
: <a class="el" href="fishsound_8h.html#a0">fishsound.h</a><li>FishSoundCodecID
: <a class="el" href="constants_8h.html#a1">constants.h</a><li>FishSoundCommand
: <a class="el" href="constants_8h.html#a2">constants.h</a><li>FishSoundDecoded
@@ -50,8 +66,9 @@
: <a class="el" href="fishsound_8h.html#a2">fishsound.h</a><li>FishSoundError
: <a class="el" href="constants_8h.html#a3">constants.h</a><li>FishSoundMode
: <a class="el" href="constants_8h.html#a0">constants.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_enum.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_enum.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_enum.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,19 +3,20 @@
<title>libfishsound: File Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindexHL" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration values</a></div>
<p>
<ul>
<li>_FishSoundCodecID
-: <a class="el" href="constants_8h.html#a19">constants.h</a><li>_FishSoundCommand
-: <a class="el" href="constants_8h.html#a20">constants.h</a><li>_FishSoundError
-: <a class="el" href="constants_8h.html#a21">constants.h</a><li>_FishSoundMode
-: <a class="el" href="constants_8h.html#a18">constants.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+: <a class="el" href="constants_8h.html#a23">constants.h</a><li>_FishSoundCommand
+: <a class="el" href="constants_8h.html#a24">constants.h</a><li>_FishSoundError
+: <a class="el" href="constants_8h.html#a25">constants.h</a><li>_FishSoundMode
+: <a class="el" href="constants_8h.html#a22">constants.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_eval.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_eval.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_eval.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,27 +3,32 @@
<title>libfishsound: File Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindexHL" href="globals_eval.html">Enumeration values</a></div>
<p>
<ul>
<li>FISH_SOUND_COMMAND_NOP
-: <a class="el" href="constants_8h.html#a20a9">constants.h</a><li>FISH_SOUND_DECODE
-: <a class="el" href="constants_8h.html#a18a4">constants.h</a><li>FISH_SOUND_ENCODE
-: <a class="el" href="constants_8h.html#a18a5">constants.h</a><li>FISH_SOUND_ERR_DISABLED
-: <a class="el" href="constants_8h.html#a21a16">constants.h</a><li>FISH_SOUND_ERR_SHORT_IDENTIFY
-: <a class="el" href="constants_8h.html#a21a17">constants.h</a><li>FISH_SOUND_GET_INFO
-: <a class="el" href="constants_8h.html#a20a10">constants.h</a><li>FISH_SOUND_GET_INTERLEAVE
-: <a class="el" href="constants_8h.html#a20a11">constants.h</a><li>FISH_SOUND_OK
-: <a class="el" href="constants_8h.html#a21a15">constants.h</a><li>FISH_SOUND_SET_INTERLEAVE
-: <a class="el" href="constants_8h.html#a20a12">constants.h</a><li>FISH_SOUND_SPEEX
-: <a class="el" href="constants_8h.html#a19a8">constants.h</a><li>FISH_SOUND_UNKNOWN
-: <a class="el" href="constants_8h.html#a19a6">constants.h</a><li>FISH_SOUND_VORBIS
-: <a class="el" href="constants_8h.html#a19a7">constants.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+: <a class="el" href="constants_8h.html#a24a9">constants.h</a><li>FISH_SOUND_DECODE
+: <a class="el" href="constants_8h.html#a22a4">constants.h</a><li>FISH_SOUND_ENCODE
+: <a class="el" href="constants_8h.html#a22a5">constants.h</a><li>FISH_SOUND_ERR_BAD
+: <a class="el" href="constants_8h.html#a25a17">constants.h</a><li>FISH_SOUND_ERR_COMMENT_INVALID
+: <a class="el" href="constants_8h.html#a25a21">constants.h</a><li>FISH_SOUND_ERR_DISABLED
+: <a class="el" href="constants_8h.html#a25a19">constants.h</a><li>FISH_SOUND_ERR_GENERIC
+: <a class="el" href="constants_8h.html#a25a16">constants.h</a><li>FISH_SOUND_ERR_INVALID
+: <a class="el" href="constants_8h.html#a25a18">constants.h</a><li>FISH_SOUND_ERR_SHORT_IDENTIFY
+: <a class="el" href="constants_8h.html#a25a20">constants.h</a><li>FISH_SOUND_GET_INFO
+: <a class="el" href="constants_8h.html#a24a10">constants.h</a><li>FISH_SOUND_GET_INTERLEAVE
+: <a class="el" href="constants_8h.html#a24a11">constants.h</a><li>FISH_SOUND_OK
+: <a class="el" href="constants_8h.html#a25a15">constants.h</a><li>FISH_SOUND_SET_INTERLEAVE
+: <a class="el" href="constants_8h.html#a24a12">constants.h</a><li>FISH_SOUND_SPEEX
+: <a class="el" href="constants_8h.html#a23a8">constants.h</a><li>FISH_SOUND_UNKNOWN
+: <a class="el" href="constants_8h.html#a23a6">constants.h</a><li>FISH_SOUND_VORBIS
+: <a class="el" href="constants_8h.html#a23a7">constants.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_func.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_func.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_func.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,27 +3,40 @@
<title>libfishsound: File Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindexHL" href="globals_func.html">Functions</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration values</a></div>
<p>
<ul>
<li>fish_sound_command()
-: <a class="el" href="fishsound_8h.html#a12">fishsound.h</a><li>fish_sound_decode()
+: <a class="el" href="fishsound_8h.html#a12">fishsound.h</a><li>fish_sound_comment_add()
+: <a class="el" href="comments_8h.html#a5">comments.h</a><li>fish_sound_comment_add_byname()
+: <a class="el" href="comments_8h.html#a6">comments.h</a><li>fish_sound_comment_first()
+: <a class="el" href="comments_8h.html#a1">comments.h</a><li>fish_sound_comment_first_byname()
+: <a class="el" href="comments_8h.html#a3">comments.h</a><li>fish_sound_comment_get_vendor()
+: <a class="el" href="comments_8h.html#a0">comments.h</a><li>fish_sound_comment_next()
+: <a class="el" href="comments_8h.html#a2">comments.h</a><li>fish_sound_comment_next_byname()
+: <a class="el" href="comments_8h.html#a4">comments.h</a><li>fish_sound_comment_remove()
+: <a class="el" href="comments_8h.html#a7">comments.h</a><li>fish_sound_comment_remove_byname()
+: <a class="el" href="comments_8h.html#a8">comments.h</a><li>fish_sound_decode()
: <a class="el" href="fishsound_8h.html#a7">fishsound.h</a><li>fish_sound_delete()
: <a class="el" href="fishsound_8h.html#a11">fishsound.h</a><li>fish_sound_encode()
: <a class="el" href="fishsound_8h.html#a8">fishsound.h</a><li>fish_sound_flush()
-: <a class="el" href="fishsound_8h.html#a9">fishsound.h</a><li>fish_sound_get_interleave()
+: <a class="el" href="fishsound_8h.html#a9">fishsound.h</a><li>fish_sound_get_frameno()
+: <a class="el" href="fishsound_8h.html#a15">fishsound.h</a><li>fish_sound_get_interleave()
: <a class="el" href="fishsound_8h.html#a13">fishsound.h</a><li>fish_sound_identify()
: <a class="el" href="fishsound_8h.html#a3">fishsound.h</a><li>fish_sound_new()
-: <a class="el" href="fishsound_8h.html#a4">fishsound.h</a><li>fish_sound_reset()
+: <a class="el" href="fishsound_8h.html#a4">fishsound.h</a><li>fish_sound_prepare_truncation()
+: <a class="el" href="fishsound_8h.html#a17">fishsound.h</a><li>fish_sound_reset()
: <a class="el" href="fishsound_8h.html#a10">fishsound.h</a><li>fish_sound_set_decoded_callback()
: <a class="el" href="fishsound_8h.html#a5">fishsound.h</a><li>fish_sound_set_encoded_callback()
-: <a class="el" href="fishsound_8h.html#a6">fishsound.h</a><li>fish_sound_set_interleave()
+: <a class="el" href="fishsound_8h.html#a6">fishsound.h</a><li>fish_sound_set_frameno()
+: <a class="el" href="fishsound_8h.html#a16">fishsound.h</a><li>fish_sound_set_interleave()
: <a class="el" href="fishsound_8h.html#a14">fishsound.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_type.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_type.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/globals_type.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: File Member Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindexHL" href="globals.html">Globals</a></div>
<div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_eval.html">Enumeration values</a></div>
@@ -17,8 +17,9 @@
: <a class="el" href="fishsound_8h.html#a2">fishsound.h</a><li>FishSoundError
: <a class="el" href="constants_8h.html#a3">constants.h</a><li>FishSoundMode
: <a class="el" href="constants_8h.html#a0">constants.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__about.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__about.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__about.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: About</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>About</h1><table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr>
@@ -22,8 +22,9 @@
Limitations</a></h2>
libfishsound has been designed to accomodate the various decoding and encoding styles required by a wide variety of software. However, as it is an abstraction of the underlying libvorbis, libvorbisenc and libspeex libraries, it may not be possible to implement some low-level techniques that these libraries enable, such as parallelization of Vorbis sub-block decoding. Nevertheless it is expected that libfishsound is a useful API for most software requiring Vorbis or Speex support, including most applications the author has encountered.<h2><a class="anchor" name="acknowledgements">
Acknowledgements</a></h2>
-Much of the API design follows the style of libsndfile. The author would like to thank Erik de Castro Lopo for feedback on the design of libfishsound. <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+Much of the API design follows the style of libsndfile. The author would like to thank Erik de Castro Lopo for feedback on the design of libfishsound. <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__building.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__building.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__building.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Building against libfishsound</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>Building against libfishsound</h1><table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr>
@@ -25,8 +25,9 @@
<pre><div>
FISHSOUND_CFLAGS=`pkg-config --cflags fishsound`</pre></div><p>
<pre><div> FISHSOUND_LIBS=`pkg-config --libs fishsound`
- </pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+ </pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__configuration.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__configuration.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__configuration.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Configuration</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>Configuration</h1><table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr>
@@ -50,8 +50,9 @@
Documentation: ............... /usr/local/share/doc/libfishsound</pre></div><p>
<pre><div> Example programs will be built but not installed.
------------------------------------------------------------------------
-</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__decode.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__decode.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__decode.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Decoding audio data</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>Decoding audio data</h1>To decode audio data using libfishsound:.
<a href="#_details">More...</a><table border=0 cellpadding=0 cellspacing=0>
@@ -12,7 +12,7 @@
<ul>
<li>create a FishSound* object with mode FISH_SOUND_DECODE. <a class="el" href="fishsound_8h.html#a4">fish_sound_new()</a> will return a new FishSound* object, initialised for decoding, and the <a class="el" href="structFishSoundInfo.html">FishSoundInfo</a> structure will be cleared.</li><li>provide a FishSoundDecoded callback for libfishsound to call when it has decoded audio.</li><li>(optionally) specify whether you want to receive interleaved or per-channel PCM data, using a <a class="el" href="fishsound_8h.html#a14">fish_sound_set_interleave()</a>. The default is for per-channel (non-interleaved) PCM.</li><li>feed encoded audio data to libfishsound via <a class="el" href="fishsound_8h.html#a7">fish_sound_decode()</a>. libfishsound will decode the audio for you, calling the FishSoundDecoded callback you provided earlier each time it has a block of audio ready.</li><li>when finished, call <a class="el" href="fishsound_8h.html#a11">fish_sound_delete()</a>.</li></ul>
<p>
-This procedure is illustrated in src/examples/decode.c. Note that this example additionally:<ul>
+This procedure is illustrated in src/examples/fishsound-decode.c. Note that this example additionally:<ul>
<li>uses liboggz to demultiplex audio data from an Ogg encapsulated Vorbis or Speex stream. Hence, the step of feeding encoded data to libfishsound is done within the OggzReadPacket callback.</li><li>uses libsndfile to write the decoded audio to a WAV file.</li></ul>
<p>
Hence this example code demonstrates all that is needed to decode both Ogg Vorbis and Ogg Speex files:<p>
@@ -97,6 +97,7 @@
{
<a class="code" href="fishsound_8h.html#a0">FishSound</a> * fsound = (<a class="code" href="fishsound_8h.html#a0">FishSound</a> *)user_data;
+ <a class="code" href="fishsound_8h.html#a17">fish_sound_prepare_truncation</a> (fsound, op->granulepos, op->e_o_s);
<a class="code" href="fishsound_8h.html#a7">fish_sound_decode</a> (fsound, op->packet, op->bytes);
<span class="keywordflow">return</span> 0;
@@ -143,8 +144,9 @@
exit (0);
}
-</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__encode.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__encode.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__encode.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Encoding audio data</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>Encoding audio data</h1>To encode audio data using libfishsound:.
<a href="#_details">More...</a><table border=0 cellpadding=0 cellspacing=0>
@@ -12,7 +12,7 @@
<ul>
<li>create a FishSound* object with mode FISH_SOUND_ENCODE, and with a <a class="el" href="structFishSoundInfo.html">FishSoundInfo</a> structure filled in with the required encoding parameters. <a class="el" href="fishsound_8h.html#a4">fish_sound_new()</a> will return a new FishSound* object initialised for encoding.</li><li>provide a FishSoundEncoded callback for libfishsound to call when it has a block of encoded audio</li><li>(optionally) specify whether you will be providing interleaved or per-channel PCM data, using a <a class="el" href="fishsound_8h.html#a14">fish_sound_set_interleave()</a>. The default is for per-channel (non-interleaved) PCM.</li><li>feed raw PCM audio data to libfishsound via <a class="el" href="fishsound_8h.html#a8">fish_sound_encode()</a>. libfishsound will encode the audio for you, calling the FishSoundEncoded callback you provided earlier each time it has a block of encoded audio ready.</li><li>when finished, call <a class="el" href="fishsound_8h.html#a11">fish_sound_delete()</
a>.</li></ul>
<p>
-This procedure is illustrated in src/examples/encode.c. Note that this example additionally:<ul>
+This procedure is illustrated in src/examples/fishsound-encode.c. Note that this example additionally:<ul>
<li>uses libsndfile to read input from a PCM audio file (WAV, AIFF, etc.)</li><li>uses liboggz to encapsulate the encoded Vorbis or Speex data in an Ogg stream.</li></ul>
<p>
Hence this example code demonstrates all that is needed to encode Ogg Vorbis and Ogg Speex files:<p>
@@ -65,7 +65,7 @@
<span class="keywordtype">char</span> * infilename, * outfilename;
<span class="keywordtype">char</span> * ext = NULL;
- <span class="keywordtype">int</span> format = <a class="code" href="constants_8h.html#a19a7">FISH_SOUND_VORBIS</a>;
+ <span class="keywordtype">int</span> format = <a class="code" href="constants_8h.html#a23a7">FISH_SOUND_VORBIS</a>;
<span class="keywordtype">float</span> pcm[2048];
<span class="keywordtype">long</span> n;
@@ -93,9 +93,9 @@
<span class="comment"> * otherwise use Vorbis */</span>
ext = strrchr (outfilename, <span class="charliteral">'.'</span>);
<span class="keywordflow">if</span> (ext && !strncasecmp (ext, <span class="stringliteral">".spx"</span>, 4))
- format = <a class="code" href="constants_8h.html#a19a8">FISH_SOUND_SPEEX</a>;
+ format = <a class="code" href="constants_8h.html#a23a8">FISH_SOUND_SPEEX</a>;
<span class="keywordflow">else</span>
- format = <a class="code" href="constants_8h.html#a19a7">FISH_SOUND_VORBIS</a>;
+ format = <a class="code" href="constants_8h.html#a23a7">FISH_SOUND_VORBIS</a>;
fsinfo.<a class="code" href="structFishSoundInfo.html#o1">channels</a> = sfinfo.channels;
fsinfo.<a class="code" href="structFishSoundInfo.html#o0">samplerate</a> = sfinfo.samplerate;
@@ -122,8 +122,9 @@
exit (0);
}
-</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__install.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__install.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__install.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Installation</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>Installation</h1><table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr>
@@ -192,8 +192,9 @@
script, and exit.
`configure' also accepts some other, not widely useful, options.
-</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__win32.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__win32.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/group__win32.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Building on Win32</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>Building on Win32</h1><table border=0 cellpadding=0 cellspacing=0>
<tr><td></td></tr>
@@ -42,7 +42,11 @@
Visual Studio.NET 2003 Installation
===================================
+NOTE: For lack of platform, we were not able to keep the solution
+files up-to-date. Please use the Visual Studio Version 6 files
+instead or send us an updated version <span class="keywordflow">if</span> you're <span class="keyword">using</span> these.
+
IMPORTANT: The solution files were built <span class="keywordflow">for</span> VS.NET 2003 and can't be
opened by VS.NET 2002. If you use VS.NET 2002 you should use the VS6
workspace files and they will be automatically converted to the <span class="keyword">new</span>
@@ -66,8 +70,9 @@
There is also a Visual C++ V 6.0 workspace file in the Win32 directory
in case you have not upgraded to Visual Studio.NET.
-</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/index.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/index.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/index.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,11 +3,11 @@
<title>libfishsound: Main Page</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindexHL" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>libfishsound Documentation</h1>
<p>
-<h3 align="center">0.6.0 </h3><h2><a class="anchor" name="intro">
+<h3 align="center">0.6.2 </h3><h2><a class="anchor" name="intro">
FishSound, the sound of fish!</a></h2>
This is the documentation for the FishSound C API. FishSound provides a simple programming interface for decoding and encoding audio data using Xiph.Org codecs (Vorbis and Speex).<p>
libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in Ogg to produce Ogg Vorbis</em> and <em>Speex</em> files. Example C programs using liboggz to read and write these files are provided in the libfishsound sources.<p>
@@ -17,6 +17,9 @@
<li><a class="el" href="fishsound_8h.html">fishsound.h </a>: Documentation of the FishSound API.</li></ul>
<p>
<ul>
+<li><a class="el" href="comments_8h.html">Handling comments </a>: How to add and retrieve name</em> = <em>value</em> metadata in Vorbis and Speex streams.</li></ul>
+<p>
+<ul>
<li><a class="el" href="group__decode.html">Decoding audio data </a>: How to decode audio data with FishSound, including source for a fully working Ogg Vorbis and Ogg Speex decoder.</li></ul>
<p>
<ul>
@@ -62,8 +65,9 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+</pre></div> <hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:24 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/modules.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/modules.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/modules.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: Module Index</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindexHL" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>libfishsound Modules</h1>Here is a list of all modules:<ul>
<li><a class="el" href="group__about.html">About</a>
@@ -14,8 +14,9 @@
<li><a class="el" href="group__decode.html">Decoding audio data</a>
<li><a class="el" href="group__encode.html">Encoding audio data</a>
</ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundComment.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundComment.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundComment.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
+<title>libfishsound: FishSoundComment struct Reference</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+</head><body>
+<!-- Generated by Doxygen 1.3.5 -->
+<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
+<h1>FishSoundComment Struct Reference</h1>A comment.
+More...
+<p>
+<code>#include <<a class="el" href="comments_8h-source.html">comments.h</a>></code>
+<p>
+<table border=0 cellpadding=0 cellspacing=0>
+<tr><td></td></tr>
+<tr><td colspan=2><br><h2>Data Fields</h2></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top>char * </td><td class="memItemRight" valign=bottom><a class="el" href="structFishSoundComment.html#o0">name</a></td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">The name of the comment, eg. <a href="#o0"></a><br><br></td></tr>
+<tr><td class="memItemLeft" nowrap align=right valign=top><a class="anchor" name="o1" doxytag="FishSoundComment::value" ></a>
+char * </td><td class="memItemRight" valign=bottom><a class="el" href="structFishSoundComment.html#o1">value</a></td></tr>
+
+<tr><td class="mdescLeft"> </td><td class="mdescRight">The value of the comment, as UTF-8. <br><br></td></tr>
+</table>
+<hr><a name="_details"></a><h2>Detailed Description</h2>
+A comment.
+<p>
+<hr><h2>Field Documentation</h2>
+<a class="anchor" name="o0" doxytag="FishSoundComment::name" ></a><p>
+<table class="mdTable" width="100%" cellpadding="2" cellspacing="0">
+ <tr>
+ <td class="mdRow">
+ <table cellpadding="0" cellspacing="0" border="0">
+ <tr>
+ <td class="md" nowrap valign="top"> char* <a class="el" href="structFishSoundComment.html#o0">FishSoundComment::name</a>
+ </table>
+ </td>
+ </tr>
+</table>
+<table cellspacing=5 cellpadding=0 border=0>
+ <tr>
+ <td>
+
+ </td>
+ <td>
+
+<p>
+The name of the comment, eg.
+<p>
+"AUTHOR" </td>
+ </tr>
+</table>
+<hr>The documentation for this struct was generated from the following file:<ul>
+<li><a class="el" href="comments_8h-source.html">comments.h</a></ul>
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
+</body>
+</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundFormat.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundFormat.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundFormat.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: FishSoundFormat struct Reference</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>FishSoundFormat Struct Reference</h1>Info about a particular sound format.
<a href="#_details">More...</a>
@@ -31,8 +31,9 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li><a class="el" href="fishsound_8h-source.html">fishsound.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundInfo.html
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundInfo.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/html/structFishSoundInfo.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -3,7 +3,7 @@
<title>libfishsound: FishSoundInfo struct Reference</title>
<link href="doxygen.css" rel="stylesheet" type="text/css">
</head><body>
-<!-- Generated by Doxygen 1.3.6-20040222 -->
+<!-- Generated by Doxygen 1.3.5 -->
<div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="modules.html">Modules</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="functions.html">Data Fields</a> | <a class="qindex" href="globals.html">Globals</a></div>
<h1>FishSoundInfo Struct Reference</h1>Info about a particular encoder/decoder instance.
<a href="#_details">More...</a>
@@ -31,8 +31,9 @@
<p>
<hr>The documentation for this struct was generated from the following file:<ul>
<li><a class="el" href="fishsound_8h-source.html">fishsound.h</a></ul>
-<hr size="1"><address style="align: right;"><small>Generated on Wed Mar 24 19:38:27 2004 for libfishsound by
+<hr size="1"><address style="align: right;"><small>Generated on Fri May 21 14:41:25 2004 for libfishsound by
<a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border=0 > </a>1.3.6-20040222 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border=0 >
+</a>1.3.5 </small></address>
</body>
</html>
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/Makefile
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/Makefile 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/Makefile 2004-05-25 14:19:54 UTC (rev 6754)
@@ -36,4 +36,4 @@
ps2pdf refman_2on1.ps refman_2on1.pdf
clean:
- rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log *.out refman.pdf
+ rm -f *.ps *.dvi *.aux *.toc *.idx *.ind *.ilg *.log *.out *.pdf
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/annotated.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/annotated.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/annotated.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,5 +1,6 @@
\section{libfishsound Data Structures}
Here are the data structures with brief descriptions:\begin{CompactList}
+\item\contentsline{section}{{\bf Fish\-Sound\-Comment} (A comment )}{\pageref{structFishSoundComment}}{}
\item\contentsline{section}{{\bf Fish\-Sound\-Format} (Info about a particular sound format )}{\pageref{structFishSoundFormat}}{}
\item\contentsline{section}{{\bf Fish\-Sound\-Info} (Info about a particular encoder/decoder instance )}{\pageref{structFishSoundInfo}}{}
\end{CompactList}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/comments_8h.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/comments_8h.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/comments_8h.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,207 @@
+\section{comments.h File Reference}
+\label{comments_8h}\index{comments.h@{comments.h}}
+Encoding and decoding of comments.
+
+
+{\tt \#include $<$fishsound/fishsound.h$>$}\par
+\subsection*{Data Structures}
+\begin{CompactItemize}
+\item
+struct {\bf Fish\-Sound\-Comment}
+\begin{CompactList}\small\item\em A comment. \item\end{CompactList}\end{CompactItemize}
+\subsection*{Functions}
+\begin{CompactItemize}
+\item
+const char $\ast$ {\bf fish\_\-sound\_\-comment\_\-get\_\-vendor} ({\bf Fish\-Sound} $\ast$fsound)
+\begin{CompactList}\small\item\em Retrieve the vendor string. \item\end{CompactList}\item
+const {\bf Fish\-Sound\-Comment} $\ast$ {\bf fish\_\-sound\_\-comment\_\-first} ({\bf Fish\-Sound} $\ast$fsound)
+\begin{CompactList}\small\item\em Retrieve the first comment. \item\end{CompactList}\item
+const {\bf Fish\-Sound\-Comment} $\ast$ {\bf fish\_\-sound\_\-comment\_\-next} ({\bf Fish\-Sound} $\ast$fsound, const {\bf Fish\-Sound\-Comment} $\ast$comment)
+\begin{CompactList}\small\item\em Retrieve the next comment. \item\end{CompactList}\item
+const {\bf Fish\-Sound\-Comment} $\ast$ {\bf fish\_\-sound\_\-comment\_\-first\_\-byname} ({\bf Fish\-Sound} $\ast$fsound, char $\ast$name)
+\begin{CompactList}\small\item\em Retrieve the first comment with a given name. \item\end{CompactList}\item
+const {\bf Fish\-Sound\-Comment} $\ast$ {\bf fish\_\-sound\_\-comment\_\-next\_\-byname} ({\bf Fish\-Sound} $\ast$fsound, const {\bf Fish\-Sound\-Comment} $\ast$comment)
+\begin{CompactList}\small\item\em Retrieve the next comment following and with the same name as a given comment. \item\end{CompactList}\item
+int {\bf fish\_\-sound\_\-comment\_\-add} ({\bf Fish\-Sound} $\ast$fsound, {\bf Fish\-Sound\-Comment} $\ast$comment)
+\begin{CompactList}\small\item\em Add a comment. \item\end{CompactList}\item
+int {\bf fish\_\-sound\_\-comment\_\-add\_\-byname} ({\bf Fish\-Sound} $\ast$fsound, const char $\ast$name, const char $\ast$value)
+\begin{CompactList}\small\item\em Add a comment by name and value. \item\end{CompactList}\item
+int {\bf fish\_\-sound\_\-comment\_\-remove} ({\bf Fish\-Sound} $\ast$fsound, {\bf Fish\-Sound\-Comment} $\ast$comment)
+\begin{CompactList}\small\item\em Remove a comment. \item\end{CompactList}\item
+int {\bf fish\_\-sound\_\-comment\_\-remove\_\-byname} ({\bf Fish\-Sound} $\ast$fsound, char $\ast$name)
+\begin{CompactList}\small\item\em Remove all comments with a given name. \item\end{CompactList}\end{CompactItemize}
+
+
+\subsection{Detailed Description}
+Encoding and decoding of comments.
+
+Vorbis and Speex bitstreams use a comment format called \char`\"{}Vorbiscomment\char`\"{}, defined {\tt here}. Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are defined in that document.
+
+The following general features of Vorbiscomment are relevant to this API:\begin{itemize}
+\item Each stream has one comment packet, which occurs before any encoded audio data in the stream.\item When encoding, Fish\-Sound will generate the comment block and pass it to the encoded() callback in sequence, just like any other packet. Hence, all comments must be set before any call to {\bf fish\_\-sound\_\-encode()}{\rm (p.\,\pageref{fishsound_8h_a8})}.\item When decoding, Fish\-Sound will decode the comment block before calling the first decoded() callback. Hence, retrieving comment data is possible from as soon as the decoded() callback is first called.\end{itemize}
+
+
+Each comment block contains one Vendor string, which can be retrieved with {\bf fish\_\-sound\_\-comment\_\-get\_\-vendor()}{\rm (p.\,\pageref{comments_8h_a0})}. When encoding, this string is effectively fixed by the codec libraries; it cannot be set by the application.
+
+The rest of a comment block consists of {\em name\/} = {\em value\/} pairs, with the following restrictions:\begin{itemize}
+\item Both the {\em name\/} and {\em value\/} must be non-empty\item The {\em name\/} is case-insensitive and must consist of ASCII within the range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.\item The {\em name\/} is not unique; multiple entries may exist with equivalent {\em name\/} within a Vorbiscomment block.\item The {\em value\/} may be any UTF-8 string.\end{itemize}
+\subsection{Retrieving comments}\label{comments_get}
+Fish\-Sound contains API methods to iterate through all comments associated with a Fish\-Sound$\ast$ handle ({\bf fish\_\-sound\_\-comment\_\-first()}{\rm (p.\,\pageref{comments_8h_a1})} and {\bf fish\_\-sound\_\-comment\_\-next()}{\rm (p.\,\pageref{comments_8h_a2})}, and to iterate through comments matching a particular name ({\bf fish\_\-sound\_\-comment\_\-first\_\-byname()}{\rm (p.\,\pageref{comments_8h_a3})} and {\bf fish\_\-sound\_\-comment\_\-next\_\-byname()}{\rm (p.\,\pageref{comments_8h_a4})}). Given that multiple comments may exist with the same {\em name\/}, you should not use {\bf fish\_\-sound\_\-comment\_\-first\_\-byname()}{\rm (p.\,\pageref{comments_8h_a3})} as a simple \char`\"{}get\char`\"{} function.\subsection{Encoding comments}\label{comments_set}
+For encoding, Fish\-Sound contains API methods for adding comments ({\bf fish\_\-sound\_\-comment\_\-add()}{\rm (p.\,\pageref{comments_8h_a5})} and {\bf fish\_\-sound\_\-comment\_\-add\_\-byname()}{\rm (p.\,\pageref{comments_8h_a6})} and for removing comments ({\bf fish\_\-sound\_\-comment\_\-remove()}{\rm (p.\,\pageref{comments_8h_a7})} and {\bf fish\_\-sound\_\-comment\_\-remove\_\-byname()}{\rm (p.\,\pageref{comments_8h_a8})}).
+
+\subsection{Function Documentation}
+\index{comments.h@{comments.h}!fish_sound_comment_add@{fish\_\-sound\_\-comment\_\-add}}
+\index{fish_sound_comment_add@{fish\_\-sound\_\-comment\_\-add}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-comment\_\-add ({\bf Fish\-Sound} $\ast$ {\em fsound}, {\bf Fish\-Sound\-Comment} $\ast$ {\em comment})}\label{comments_8h_a5}
+
+
+Add a comment.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle (created with mode FISH\_\-SOUND\_\-ENCODE) \item[{\em comment}]The comment to add \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em 0}]Success \item[{\em FISH\_\-SOUND\_\-ERR\_\-BAD}]{\em fsound\/} is not a valid Fish\-Sound$\ast$ handle \item[{\em FISH\_\-SOUND\_\-ERR\_\-INVALID}]Operation not suitable for this Fish\-Sound \end{description}
+\end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_add_byname@{fish\_\-sound\_\-comment\_\-add\_\-byname}}
+\index{fish_sound_comment_add_byname@{fish\_\-sound\_\-comment\_\-add\_\-byname}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-comment\_\-add\_\-byname ({\bf Fish\-Sound} $\ast$ {\em fsound}, const char $\ast$ {\em name}, const char $\ast$ {\em value})}\label{comments_8h_a6}
+
+
+Add a comment by name and value.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle (created with mode FISH\_\-SOUND\_\-ENCODE) \item[{\em name}]The name of the comment to add \item[{\em value}]The contents of the comment to add \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em 0}]Success \item[{\em FISH\_\-SOUND\_\-ERR\_\-BAD}]{\em fsound\/} is not a valid Fish\-Sound$\ast$ handle \item[{\em FISH\_\-SOUND\_\-ERR\_\-INVALID}]Operation not suitable for this Fish\-Sound \end{description}
+\end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_first@{fish\_\-sound\_\-comment\_\-first}}
+\index{fish_sound_comment_first@{fish\_\-sound\_\-comment\_\-first}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const {\bf Fish\-Sound\-Comment}$\ast$ fish\_\-sound\_\-comment\_\-first ({\bf Fish\-Sound} $\ast$ {\em fsound})}\label{comments_8h_a1}
+
+
+Retrieve the first comment.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]A read-only copy of the first comment, or NULL if no comments exist for this Fish\-Sound$\ast$ object. \end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_first_byname@{fish\_\-sound\_\-comment\_\-first\_\-byname}}
+\index{fish_sound_comment_first_byname@{fish\_\-sound\_\-comment\_\-first\_\-byname}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const {\bf Fish\-Sound\-Comment}$\ast$ fish\_\-sound\_\-comment\_\-first\_\-byname ({\bf Fish\-Sound} $\ast$ {\em fsound}, char $\ast$ {\em name})}\label{comments_8h_a3}
+
+
+Retrieve the first comment with a given name.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \item[{\em name}]the name of the comment to retrieve. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]A read-only copy of the first comment matching the given {\em name\/}. \end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em NULL}]no match was found. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Note:]If {\em name\/} is NULL, the behaviour is the same as for {\bf fish\_\-sound\_\-comment\_\-first()}{\rm (p.\,\pageref{comments_8h_a1})} \end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_get_vendor@{fish\_\-sound\_\-comment\_\-get\_\-vendor}}
+\index{fish_sound_comment_get_vendor@{fish\_\-sound\_\-comment\_\-get\_\-vendor}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const char$\ast$ fish\_\-sound\_\-comment\_\-get\_\-vendor ({\bf Fish\-Sound} $\ast$ {\em fsound})}\label{comments_8h_a0}
+
+
+Retrieve the vendor string.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]A read-only copy of the vendor string \end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em NULL}]No vendor string is associated with {\em fsound\/}, or {\em fsound\/} is NULL. \end{description}
+\end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_next@{fish\_\-sound\_\-comment\_\-next}}
+\index{fish_sound_comment_next@{fish\_\-sound\_\-comment\_\-next}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const {\bf Fish\-Sound\-Comment}$\ast$ fish\_\-sound\_\-comment\_\-next ({\bf Fish\-Sound} $\ast$ {\em fsound}, const {\bf Fish\-Sound\-Comment} $\ast$ {\em comment})}\label{comments_8h_a2}
+
+
+Retrieve the next comment.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \item[{\em comment}]The previous comment. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]A read-only copy of the comment immediately following the given comment. \end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_next_byname@{fish\_\-sound\_\-comment\_\-next\_\-byname}}
+\index{fish_sound_comment_next_byname@{fish\_\-sound\_\-comment\_\-next\_\-byname}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}const {\bf Fish\-Sound\-Comment}$\ast$ fish\_\-sound\_\-comment\_\-next\_\-byname ({\bf Fish\-Sound} $\ast$ {\em fsound}, const {\bf Fish\-Sound\-Comment} $\ast$ {\em comment})}\label{comments_8h_a4}
+
+
+Retrieve the next comment following and with the same name as a given comment.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \item[{\em comment}]A comment \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]A read-only copy of the next comment with the same name as {\em comment\/}. \end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em NULL}]no further comments with the same name exist for this Fish\-Sound$\ast$ object. \end{description}
+\end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_remove@{fish\_\-sound\_\-comment\_\-remove}}
+\index{fish_sound_comment_remove@{fish\_\-sound\_\-comment\_\-remove}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-comment\_\-remove ({\bf Fish\-Sound} $\ast$ {\em fsound}, {\bf Fish\-Sound\-Comment} $\ast$ {\em comment})}\label{comments_8h_a7}
+
+
+Remove a comment.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle (created with FISH\_\-SOUND\_\-ENCODE) \item[{\em comment}]The comment to remove. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em 1}]Success: comment removed \item[{\em 0}]No-op: comment not found, nothing to remove \item[{\em FISH\_\-SOUND\_\-ERR\_\-BAD}]{\em fsound\/} is not a valid Fish\-Sound$\ast$ handle \item[{\em FISH\_\-SOUND\_\-ERR\_\-INVALID}]Operation not suitable for this Fish\-Sound \end{description}
+\end{Desc}
+\index{comments.h@{comments.h}!fish_sound_comment_remove_byname@{fish\_\-sound\_\-comment\_\-remove\_\-byname}}
+\index{fish_sound_comment_remove_byname@{fish\_\-sound\_\-comment\_\-remove\_\-byname}!comments.h@{comments.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-comment\_\-remove\_\-byname ({\bf Fish\-Sound} $\ast$ {\em fsound}, char $\ast$ {\em name})}\label{comments_8h_a8}
+
+
+Remove all comments with a given name.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle (created with FISH\_\-SOUND\_\-ENCODE) \item[{\em name}]The name of the comments to remove \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em $>$= 0}]The number of comments removed \item[{\em FISH\_\-SOUND\_\-ERR\_\-BAD}]{\em fsound\/} is not a valid Fish\-Sound$\ast$ handle \item[{\em FISH\_\-SOUND\_\-ERR\_\-INVALID}]Operation not suitable for this Fish\-Sound \end{description}
+\end{Desc}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/constants_8h.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/constants_8h.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/constants_8h.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -40,9 +40,15 @@
{\bf FISH\_\-SOUND\_\-COMMAND\_\-MAX}
\}
\begin{CompactList}\small\item\em Command codes. \item\end{CompactList}\item
-enum {\bf \_\-Fish\-Sound\-Error} \{ {\bf FISH\_\-SOUND\_\-OK} = 0,
+enum {\bf \_\-Fish\-Sound\-Error} \{ \par
+{\bf FISH\_\-SOUND\_\-OK} = 0,
+{\bf FISH\_\-SOUND\_\-ERR\_\-GENERIC} = -1,
+{\bf FISH\_\-SOUND\_\-ERR\_\-BAD} = -2,
+{\bf FISH\_\-SOUND\_\-ERR\_\-INVALID} = -3,
+\par
{\bf FISH\_\-SOUND\_\-ERR\_\-DISABLED} = -10,
-{\bf FISH\_\-SOUND\_\-ERR\_\-SHORT\_\-IDENTIFY} = -20
+{\bf FISH\_\-SOUND\_\-ERR\_\-SHORT\_\-IDENTIFY} = -20,
+{\bf FISH\_\-SOUND\_\-ERR\_\-COMMENT\_\-INVALID} = -21
\}
\begin{CompactList}\small\item\em Error values. \item\end{CompactList}\end{CompactItemize}
@@ -55,7 +61,7 @@
\subsection{Enumeration Type Documentation}
\index{constants.h@{constants.h}!_FishSoundCodecID@{\_\-FishSoundCodecID}}
\index{_FishSoundCodecID@{\_\-FishSoundCodecID}!constants.h@{constants.h}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Codec\-ID}}\label{constants_8h_a19}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Codec\-ID}}\label{constants_8h_a23}
Identifiers for supported codecs.
@@ -64,17 +70,17 @@
\item[Enumeration values: ]\par
\begin{description}
\index{FISH_SOUND_UNKNOWN@{FISH\_\-SOUND\_\-UNKNOWN}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_UNKNOWN@{FISH\_\-SOUND\_\-UNKNOWN}}\item[{\em
-FISH\_\-SOUND\_\-UNKNOWN\label{constants_8h_a19a6}
+FISH\_\-SOUND\_\-UNKNOWN\label{constants_8h_a23a6}
}]Unknown. \index{FISH_SOUND_VORBIS@{FISH\_\-SOUND\_\-VORBIS}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_VORBIS@{FISH\_\-SOUND\_\-VORBIS}}\item[{\em
-FISH\_\-SOUND\_\-VORBIS\label{constants_8h_a19a7}
+FISH\_\-SOUND\_\-VORBIS\label{constants_8h_a23a7}
}]Vorbis. \index{FISH_SOUND_SPEEX@{FISH\_\-SOUND\_\-SPEEX}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_SPEEX@{FISH\_\-SOUND\_\-SPEEX}}\item[{\em
-FISH\_\-SOUND\_\-SPEEX\label{constants_8h_a19a8}
+FISH\_\-SOUND\_\-SPEEX\label{constants_8h_a23a8}
}]Speex. \end{description}
\end{Desc}
\index{constants.h@{constants.h}!_FishSoundCommand@{\_\-FishSoundCommand}}
\index{_FishSoundCommand@{\_\-FishSoundCommand}!constants.h@{constants.h}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Command}}\label{constants_8h_a20}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Command}}\label{constants_8h_a24}
Command codes.
@@ -83,19 +89,19 @@
\item[Enumeration values: ]\par
\begin{description}
\index{FISH_SOUND_COMMAND_NOP@{FISH\_\-SOUND\_\-COMMAND\_\-NOP}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_COMMAND_NOP@{FISH\_\-SOUND\_\-COMMAND\_\-NOP}}\item[{\em
-FISH\_\-SOUND\_\-COMMAND\_\-NOP\label{constants_8h_a20a9}
+FISH\_\-SOUND\_\-COMMAND\_\-NOP\label{constants_8h_a24a9}
}]No operation. \index{FISH_SOUND_GET_INFO@{FISH\_\-SOUND\_\-GET\_\-INFO}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_GET_INFO@{FISH\_\-SOUND\_\-GET\_\-INFO}}\item[{\em
-FISH\_\-SOUND\_\-GET\_\-INFO\label{constants_8h_a20a10}
+FISH\_\-SOUND\_\-GET\_\-INFO\label{constants_8h_a24a10}
}]Retrieve the {\bf Fish\-Sound\-Info}{\rm (p.\,\pageref{structFishSoundInfo})}. \index{FISH_SOUND_GET_INTERLEAVE@{FISH\_\-SOUND\_\-GET\_\-INTERLEAVE}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_GET_INTERLEAVE@{FISH\_\-SOUND\_\-GET\_\-INTERLEAVE}}\item[{\em
-FISH\_\-SOUND\_\-GET\_\-INTERLEAVE\label{constants_8h_a20a11}
+FISH\_\-SOUND\_\-GET\_\-INTERLEAVE\label{constants_8h_a24a11}
}]Query if multichannel audio should be interpreted as interleaved. \index{FISH_SOUND_SET_INTERLEAVE@{FISH\_\-SOUND\_\-SET\_\-INTERLEAVE}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_SET_INTERLEAVE@{FISH\_\-SOUND\_\-SET\_\-INTERLEAVE}}\item[{\em
-FISH\_\-SOUND\_\-SET\_\-INTERLEAVE\label{constants_8h_a20a12}
+FISH\_\-SOUND\_\-SET\_\-INTERLEAVE\label{constants_8h_a24a12}
}]Set to 1 to interleave, 0 to non-interleave. \end{description}
\end{Desc}
\index{constants.h@{constants.h}!_FishSoundError@{\_\-FishSoundError}}
\index{_FishSoundError@{\_\-FishSoundError}!constants.h@{constants.h}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Error}}\label{constants_8h_a21}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Error}}\label{constants_8h_a25}
Error values.
@@ -104,17 +110,25 @@
\item[Enumeration values: ]\par
\begin{description}
\index{FISH_SOUND_OK@{FISH\_\-SOUND\_\-OK}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_OK@{FISH\_\-SOUND\_\-OK}}\item[{\em
-FISH\_\-SOUND\_\-OK\label{constants_8h_a21a15}
-}]No error. \index{FISH_SOUND_ERR_DISABLED@{FISH\_\-SOUND\_\-ERR\_\-DISABLED}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_DISABLED@{FISH\_\-SOUND\_\-ERR\_\-DISABLED}}\item[{\em
-FISH\_\-SOUND\_\-ERR\_\-DISABLED\label{constants_8h_a21a16}
+FISH\_\-SOUND\_\-OK\label{constants_8h_a25a15}
+}]No error. \index{FISH_SOUND_ERR_GENERIC@{FISH\_\-SOUND\_\-ERR\_\-GENERIC}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_GENERIC@{FISH\_\-SOUND\_\-ERR\_\-GENERIC}}\item[{\em
+FISH\_\-SOUND\_\-ERR\_\-GENERIC\label{constants_8h_a25a16}
+}]generic error \index{FISH_SOUND_ERR_BAD@{FISH\_\-SOUND\_\-ERR\_\-BAD}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_BAD@{FISH\_\-SOUND\_\-ERR\_\-BAD}}\item[{\em
+FISH\_\-SOUND\_\-ERR\_\-BAD\label{constants_8h_a25a17}
+}]Not a valid Fish\-Sound$\ast$ handle. \index{FISH_SOUND_ERR_INVALID@{FISH\_\-SOUND\_\-ERR\_\-INVALID}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_INVALID@{FISH\_\-SOUND\_\-ERR\_\-INVALID}}\item[{\em
+FISH\_\-SOUND\_\-ERR\_\-INVALID\label{constants_8h_a25a18}
+}]The requested operation is not suitable for this Fish\-Sound$\ast$ handle. \index{FISH_SOUND_ERR_DISABLED@{FISH\_\-SOUND\_\-ERR\_\-DISABLED}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_DISABLED@{FISH\_\-SOUND\_\-ERR\_\-DISABLED}}\item[{\em
+FISH\_\-SOUND\_\-ERR\_\-DISABLED\label{constants_8h_a25a19}
}]Functionality disabled at build time. \index{FISH_SOUND_ERR_SHORT_IDENTIFY@{FISH\_\-SOUND\_\-ERR\_\-SHORT\_\-IDENTIFY}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_SHORT_IDENTIFY@{FISH\_\-SOUND\_\-ERR\_\-SHORT\_\-IDENTIFY}}\item[{\em
-FISH\_\-SOUND\_\-ERR\_\-SHORT\_\-IDENTIFY\label{constants_8h_a21a17}
-}]Too few bytes passed to {\bf fish\_\-sound\_\-identify()}{\rm (p.\,\pageref{fishsound_8h_a3})}. \end{description}
+FISH\_\-SOUND\_\-ERR\_\-SHORT\_\-IDENTIFY\label{constants_8h_a25a20}
+}]Too few bytes passed to {\bf fish\_\-sound\_\-identify()}{\rm (p.\,\pageref{fishsound_8h_a3})}. \index{FISH_SOUND_ERR_COMMENT_INVALID@{FISH\_\-SOUND\_\-ERR\_\-COMMENT\_\-INVALID}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ERR_COMMENT_INVALID@{FISH\_\-SOUND\_\-ERR\_\-COMMENT\_\-INVALID}}\item[{\em
+FISH\_\-SOUND\_\-ERR\_\-COMMENT\_\-INVALID\label{constants_8h_a25a21}
+}]Comment violates Vorbis\-Comment restrictions. \end{description}
\end{Desc}
\index{constants.h@{constants.h}!_FishSoundMode@{\_\-FishSoundMode}}
\index{_FishSoundMode@{\_\-FishSoundMode}!constants.h@{constants.h}}
-\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Mode}}\label{constants_8h_a18}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}enum {\bf \_\-Fish\-Sound\-Mode}}\label{constants_8h_a22}
Mode of operation (encode or decode).
@@ -123,9 +137,9 @@
\item[Enumeration values: ]\par
\begin{description}
\index{FISH_SOUND_DECODE@{FISH\_\-SOUND\_\-DECODE}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_DECODE@{FISH\_\-SOUND\_\-DECODE}}\item[{\em
-FISH\_\-SOUND\_\-DECODE\label{constants_8h_a18a4}
+FISH\_\-SOUND\_\-DECODE\label{constants_8h_a22a4}
}]Decode. \index{FISH_SOUND_ENCODE@{FISH\_\-SOUND\_\-ENCODE}!constants.h@{constants.h}}\index{constants.h@{constants.h}!FISH_SOUND_ENCODE@{FISH\_\-SOUND\_\-ENCODE}}\item[{\em
-FISH\_\-SOUND\_\-ENCODE\label{constants_8h_a18a5}
+FISH\_\-SOUND\_\-ENCODE\label{constants_8h_a22a5}
}]Encode. \end{description}
\end{Desc}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/doxygen.sty
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/doxygen.sty 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/doxygen.sty 2004-05-25 14:19:54 UTC (rev 6754)
@@ -10,8 +10,8 @@
{\fancyplain{}{\bfseries\rightmark}}
\rhead[\fancyplain{}{\bfseries\leftmark}]
{\fancyplain{}{\bfseries\thepage}}
-\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Wed Mar 24 19:38:27 2004 for libfishsound by Doxygen }]{}
-\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Wed Mar 24 19:38:27 2004 for libfishsound by Doxygen }}
+\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Fri May 21 14:41:25 2004 for libfishsound by Doxygen }]{}
+\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Fri May 21 14:41:25 2004 for libfishsound by Doxygen }}
\cfoot{}
\newenvironment{CompactList}
{\begin{list}{}{
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/files.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/files.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/files.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,5 +1,6 @@
\section{libfishsound File List}
Here is a list of all documented files with brief descriptions:\begin{CompactList}
+\item\contentsline{section}{{\bf comments.h} (Encoding and decoding of comments )}{\pageref{comments_8h}}{}
\item\contentsline{section}{{\bf constants.h} (Constants used by libfishsound )}{\pageref{constants_8h}}{}
\item\contentsline{section}{{\bf fishsound.h} (The libfishsound C API )}{\pageref{fishsound_8h}}{}
\end{CompactList}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/fishsound_8h.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/fishsound_8h.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/fishsound_8h.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -4,13 +4,14 @@
{\tt \#include $<$fishsound/constants.h$>$}\par
+{\tt \#include $<$fishsound/comments.h$>$}\par
\subsection*{Data Structures}
\begin{CompactItemize}
\item
+struct {\bf Fish\-Sound\-Format}
+\begin{CompactList}\small\item\em Info about a particular sound format. \item\end{CompactList}\item
struct {\bf Fish\-Sound\-Info}
-\begin{CompactList}\small\item\em Info about a particular encoder/decoder instance. \item\end{CompactList}\item
-struct {\bf Fish\-Sound\-Format}
-\begin{CompactList}\small\item\em Info about a particular sound format. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em Info about a particular encoder/decoder instance. \item\end{CompactList}\end{CompactItemize}
\subsection*{Typedefs}
\begin{CompactItemize}
\item
@@ -46,15 +47,21 @@
int {\bf fish\_\-sound\_\-get\_\-interleave} ({\bf Fish\-Sound} $\ast$fsound)
\begin{CompactList}\small\item\em Query whether a Fish\-Sound object is using interleaved PCM. \item\end{CompactList}\item
int {\bf fish\_\-sound\_\-set\_\-interleave} ({\bf Fish\-Sound} $\ast$fsound, int interleave)
-\begin{CompactList}\small\item\em Set the PCM format used by a Fish\-Sound object. \item\end{CompactList}\end{CompactItemize}
+\begin{CompactList}\small\item\em Set the PCM format used by a Fish\-Sound object. \item\end{CompactList}\item
+long {\bf fish\_\-sound\_\-get\_\-frameno} ({\bf Fish\-Sound} $\ast$fsound)
+\begin{CompactList}\small\item\em Query the current frame number of a Fish\-Sound object. \item\end{CompactList}\item
+int {\bf fish\_\-sound\_\-set\_\-frameno} ({\bf Fish\-Sound} $\ast$fsound, long frameno)
+\begin{CompactList}\small\item\em Set the current frame number of a Fish\-Sound object. \item\end{CompactList}\item
+int {\bf fish\_\-sound\_\-prepare\_\-truncation} ({\bf Fish\-Sound} $\ast$fsound, long next\_\-granulepos, int next\_\-eos)
+\begin{CompactList}\small\item\em Prepare truncation details for the next block of data. \item\end{CompactList}\end{CompactItemize}
\subsection{Detailed Description}
The libfishsound C API.
-\subsection{General usage}\label{fishsound_8h_general}
-All access is managed via a Fish\-Sound$\ast$ handle. This is instantiated using {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} and should be deleted with {\bf fish\_\-sound\_\-delete()}{\rm (p.\,\pageref{fishsound_8h_a11})} when no longer required. If there is a discontinuity in the input data (eg. after seeking in an input file), call {\bf fish\_\-sound\_\-reset()}{\rm (p.\,\pageref{fishsound_8h_a10})} to reset the internal codec state.\subsection{Decoding}\label{fishsound_8h_decoding}
-libfishsound provides callback based decoding: you feed it encoded audio data, and it will call your callback with decoded PCM. A more detailed explanation and a full example of decoding Ogg Vorbis and Speex files is provided in the {\bf Decoding audio data }{\rm (p.\,\pageref{group__decode})} section.\subsection{Encoding}\label{fishsound_8h_encoding}
+\subsection{General usage}\label{general}
+All access is managed via a Fish\-Sound$\ast$ handle. This is instantiated using {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} and should be deleted with {\bf fish\_\-sound\_\-delete()}{\rm (p.\,\pageref{fishsound_8h_a11})} when no longer required. If there is a discontinuity in the input data (eg. after seeking in an input file), call {\bf fish\_\-sound\_\-reset()}{\rm (p.\,\pageref{fishsound_8h_a10})} to reset the internal codec state.\subsection{Decoding}\label{decoding}
+libfishsound provides callback based decoding: you feed it encoded audio data, and it will call your callback with decoded PCM. A more detailed explanation and a full example of decoding Ogg Vorbis and Speex files is provided in the {\bf Decoding audio data }{\rm (p.\,\pageref{group__decode})} section.\subsection{Encoding}\label{encoding}
libfishsound provides callback based encoding: you feed it PCM audio, and it will call your callback with encoded audio data. A more detailed explanation and a full example of encoding Ogg Vorbis and Speex files is provided in the {\bf Encoding audio data }{\rm (p.\,\pageref{group__encode})} section.
\subsection{Typedef Documentation}
@@ -174,6 +181,29 @@
\end{Desc}
\begin{Desc}
\item[Returns:]0 on success, -1 on failure \end{Desc}
+\index{fishsound.h@{fishsound.h}!fish_sound_get_frameno@{fish\_\-sound\_\-get\_\-frameno}}
+\index{fish_sound_get_frameno@{fish\_\-sound\_\-get\_\-frameno}!fishsound.h@{fishsound.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}long fish\_\-sound\_\-get\_\-frameno ({\bf Fish\-Sound} $\ast$ {\em fsound})}\label{fishsound_8h_a15}
+
+
+Query the current frame number of a Fish\-Sound object.
+
+For decoding, this is the greatest frame index that has been decoded and made available to a Fish\-Sound\-Decoded callback. This function is safe to call from within a Fish\-Sound\-Decoded callback, and corresponds to the frame number of the last frame in the current decoded block.
+
+For encoding, this is the greatest frame index that has been encoded. This function is safe to call from within a Fish\-Sound\-Encoded callback, and corresponds to the frame number of the last frame encoded in the current block.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Returns:]The current frame number \end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em -1}]Invalid {\em fsound\/} \end{description}
+\end{Desc}
\index{fishsound.h@{fishsound.h}!fish_sound_get_interleave@{fish\_\-sound\_\-get\_\-interleave}}
\index{fish_sound_get_interleave@{fish\_\-sound\_\-get\_\-interleave}!fishsound.h@{fishsound.h}}
\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-get\_\-interleave ({\bf Fish\-Sound} $\ast$ {\em fsound})}\label{fishsound_8h_a13}
@@ -226,6 +256,29 @@
\end{Desc}
\begin{Desc}
\item[Returns:]A new Fish\-Sound$\ast$ handle, or NULL on error \end{Desc}
+\index{fishsound.h@{fishsound.h}!fish_sound_prepare_truncation@{fish\_\-sound\_\-prepare\_\-truncation}}
+\index{fish_sound_prepare_truncation@{fish\_\-sound\_\-prepare\_\-truncation}!fishsound.h@{fishsound.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-prepare\_\-truncation ({\bf Fish\-Sound} $\ast$ {\em fsound}, long {\em next\_\-granulepos}, int {\em next\_\-eos})}\label{fishsound_8h_a17}
+
+
+Prepare truncation details for the next block of data.
+
+The semantics of these parameters derives directly from Ogg encapsulation of Vorbis, described {\tt here}.
+
+When decoding from Ogg, you should call this function with the {\em granulepos\/} and {\em eos\/} of the {\em ogg\_\-packet\/} structure. This call should be made before passing the packet's data to {\bf fish\_\-sound\_\-decode()}{\rm (p.\,\pageref{fishsound_8h_a7})}. Failure to do so may result in minor decode errors on the first and/or last packet of the stream.
+
+When encoding into Ogg, you should call this function with the {\em granulepos\/} and {\em eos\/} that will be used for the {\em ogg\_\-packet\/} structure. This call should be made before passing the block of audio data to {\bf fish\_\-sound\_\-encode()}{\rm (p.\,\pageref{fishsound_8h_a8})}. Failure to do so may result in minor encoding errors on the first and/or last packet of the stream.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \item[{\em next\_\-granulepos}]The \char`\"{}granulepos\char`\"{} for the next block to decode. If unknown, set {\em next\_\-granulepos\/} to -1. Otherwise, {\em next\_\-granulepos\/} specifies the frameno of the final frame in the block. This is authoritative, hence can be used to indicate various forms of truncation at the beginning or end of a stream. Mid-stream, a later-than-expected \char`\"{}granulepos\char`\"{} indicates that some data was missing. \item[{\em next\_\-eos}]A boolean indicating whether the next data block will be the last in the stream. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em 0}]Success \item[{\em -1}]Invalid {\em fsound\/} \end{description}
+\end{Desc}
\index{fishsound.h@{fishsound.h}!fish_sound_reset@{fish\_\-sound\_\-reset}}
\index{fish_sound_reset@{fish\_\-sound\_\-reset}!fishsound.h@{fishsound.h}}
\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-reset ({\bf Fish\-Sound} $\ast$ {\em fsound})}\label{fishsound_8h_a10}
@@ -233,6 +286,8 @@
Reset the codec state of a Fish\-Sound object.
+When decoding from a seekable file, {\bf fish\_\-sound\_\-reset()}{\rm (p.\,\pageref{fishsound_8h_a10})} should be called after any seek operations. See also {\bf fish\_\-sound\_\-set\_\-frameno()}{\rm (p.\,\pageref{fishsound_8h_a16})}.
+
\begin{Desc}
\item[Parameters:]
\begin{description}
@@ -268,6 +323,25 @@
\end{Desc}
\begin{Desc}
\item[Returns:]0 on success, -1 on failure \end{Desc}
+\index{fishsound.h@{fishsound.h}!fish_sound_set_frameno@{fish\_\-sound\_\-set\_\-frameno}}
+\index{fish_sound_set_frameno@{fish\_\-sound\_\-set\_\-frameno}!fishsound.h@{fishsound.h}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-set\_\-frameno ({\bf Fish\-Sound} $\ast$ {\em fsound}, long {\em frameno})}\label{fishsound_8h_a16}
+
+
+Set the current frame number of a Fish\-Sound object.
+
+When decoding from a seekable file, {\bf fish\_\-sound\_\-set\_\-frameno()}{\rm (p.\,\pageref{fishsound_8h_a16})} should be called after any seek operations, otherwise the value returned by {\bf fish\_\-sound\_\-get\_\-frameno()}{\rm (p.\,\pageref{fishsound_8h_a15})} will simply continue to increment. See also {\bf fish\_\-sound\_\-reset()}{\rm (p.\,\pageref{fishsound_8h_a10})}.
+
+\begin{Desc}
+\item[Parameters:]
+\begin{description}
+\item[{\em fsound}]A Fish\-Sound$\ast$ handle \item[{\em frameno}]The current frame number. \end{description}
+\end{Desc}
+\begin{Desc}
+\item[Return values:]
+\begin{description}
+\item[{\em 0}]Success \item[{\em -1}]Invalid {\em fsound\/} \end{description}
+\end{Desc}
\index{fishsound.h@{fishsound.h}!fish_sound_set_interleave@{fish\_\-sound\_\-set\_\-interleave}}
\index{fish_sound_set_interleave@{fish\_\-sound\_\-set\_\-interleave}!fishsound.h@{fishsound.h}}
\subsubsection{\setlength{\rightskip}{0pt plus 5cm}int fish\_\-sound\_\-set\_\-interleave ({\bf Fish\-Sound} $\ast$ {\em fsound}, int {\em interleave})}\label{fishsound_8h_a14}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__about.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__about.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__about.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,17 +1,17 @@
\section{About}
\label{group__about}\index{About@{About}}
-\subsection{Design}\label{group__about_design}
+\subsection{Design}\label{design}
libfishsound provides a simple programming interface for decoding and encoding audio data using codecs from {\tt Xiph.Org}.
libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in {\tt Ogg} to produce {\em Ogg Vorbis\/} and {\em Speex\/} files. Example C programs using {\tt liboggz} to read and write these files are provided in the libfishsound sources.
-libfishsound is implemented as a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. The motivation for this is twofold: to simplify the task of developing application software that supports these codecs, and to ensure that valid codec streams are generated.\subsection{History}\label{group__about_history}
+libfishsound is implemented as a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. The motivation for this is twofold: to simplify the task of developing application software that supports these codecs, and to ensure that valid codec streams are generated.\subsection{History}\label{history}
libfishsound was designed and developed by Conrad Parker on the weekend of October 18-19 2003. Previously the author had implemented Vorbis and Speex support in the following software:\begin{itemize}
\item {\tt Sweep}, a digital audio editor with decoding and GUI control of all encoding options of Vorbis and Speex\item Speex support in the {\tt xine} multimedia player\item Vorbis and Speex importers for {\tt libannodex}, the basic library for reading and writing {\tt Annodex.net} media files.\end{itemize}
The implementation of libfishsound draws heavily on these sources, and in turn the original example sources of libvorbis and libvorbisenc by Monty, and libspeex by Jean-Marc Valin.
-The naming of libfishsound reflects both the Xiph.Org logo and the author's reputation as a dirty, smelly old fish.\subsection{Limitations}\label{group__about_limitations}
-libfishsound has been designed to accomodate the various decoding and encoding styles required by a wide variety of software. However, as it is an abstraction of the underlying libvorbis, libvorbisenc and libspeex libraries, it may not be possible to implement some low-level techniques that these libraries enable, such as parallelization of Vorbis sub-block decoding. Nevertheless it is expected that libfishsound is a useful API for most software requiring Vorbis or Speex support, including most applications the author has encountered.\subsection{Acknowledgements}\label{group__about_acknowledgements}
+The naming of libfishsound reflects both the Xiph.Org logo and the author's reputation as a dirty, smelly old fish.\subsection{Limitations}\label{limitations}
+libfishsound has been designed to accomodate the various decoding and encoding styles required by a wide variety of software. However, as it is an abstraction of the underlying libvorbis, libvorbisenc and libspeex libraries, it may not be possible to implement some low-level techniques that these libraries enable, such as parallelization of Vorbis sub-block decoding. Nevertheless it is expected that libfishsound is a useful API for most software requiring Vorbis or Speex support, including most applications the author has encountered.\subsection{Acknowledgements}\label{acknowledgements}
Much of the API design follows the style of {\tt libsndfile}. The author would like to thank Erik de Castro Lopo for feedback on the design of libfishsound.
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__building.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__building.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__building.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,6 @@
\section{Building against libfishsound}
\label{group__building}\index{Building against libfishsound@{Building against libfishsound}}
-\subsection{Using GNU autoconf}\label{group__building_autoconf}
+\subsection{Using GNU autoconf}\label{autoconf}
If you are using GNU autoconf, you do not need to call pkg-config directly. Use the following macro to determine if libfishsound is available:
\small\begin{alltt}
@@ -13,7 +13,7 @@
\end{alltt}\normalsize
-If libfishsound is found, HAVE\_\-FISHSOUND will be set to \char`\"{}yes\char`\"{}, and the autoconf variables FISHSOUND\_\-CFLAGS and FISHSOUND\_\-LIBS will be set appropriately.\subsection{Determining compiler options with pkg-config}\label{group__building_pkg-config}
+If libfishsound is found, HAVE\_\-FISHSOUND will be set to \char`\"{}yes\char`\"{}, and the autoconf variables FISHSOUND\_\-CFLAGS and FISHSOUND\_\-LIBS will be set appropriately.\subsection{Determining compiler options with pkg-config}\label{pkg-config}
If you are not using GNU autoconf in your project, you can use the pkg-config tool directly to determine the correct compiler options.
\small\begin{alltt}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__configuration.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__configuration.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__configuration.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,24 +1,24 @@
\section{Configuration}
\label{group__configuration}\index{Configuration@{Configuration}}
-\subsection{Platform-specific configuration}\label{group__configuration_platforms}
+\subsection{Platform-specific configuration}\label{platforms}
Fish\-Sound can be configured on most platforms using the GNU autoconf ./configure system described below.
-For Win32, see the {\bf README.win32 }{\rm (p.\,\pageref{group__win32})} section. You will need to edit {\tt win32/config.h} by hand to achieve the customizations described below.\subsection{./configure}\label{group__configuration_configure}
+For Win32, see the {\bf README.win32 }{\rm (p.\,\pageref{group__win32})} section. You will need to edit {\tt win32/config.h} by hand to achieve the customizations described below.\subsection{./configure}\label{configure}
It is possible to customize the functionality of libfishsound by using various ./configure flags when building it from source; for example you can build a smaller version of libfishsound to only decode or encode, or and you can choose to disable support for a particular codec. By default, both decoding and encoding support is built for all codecs found on the system.
-For general information about using ./configure, see the file {\bf INSTALL }{\rm (p.\,\pageref{group__install})}\subsubsection{Removing encoding support}\label{group__configuration_no_encode}
+For general information about using ./configure, see the file {\bf INSTALL }{\rm (p.\,\pageref{group__install})}\subsubsection{Removing encoding support}\label{no_encode}
Configuring with {\em --disable-encode\/} will remove all support for encoding:\begin{itemize}
\item All internal encoding related functions will not be built\item Any attempt to call {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} with {\em mode\/} == FISH\_\-SOUND\_\-ENCODE will fail, returning NULL\item Any attempt to call {\bf fish\_\-sound\_\-encode()}{\rm (p.\,\pageref{fishsound_8h_a8})} will return FISH\_\-SOUND\_\-ERR\_\-DISABLED\item The resulting library will not be linked against libvorbisenc\end{itemize}
-\subsubsection{Removing decoding support}\label{group__configuration_no_decode}
+\subsubsection{Removing decoding support}\label{no_decode}
Configuring with {\em --disable-decode\/} will remove all support for decoding:\begin{itemize}
\item All internal decoding related functions will not be built\item Any attempt to call {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} with {\em mode\/} == FISH\_\-SOUND\_\-DECODE will fail, returning NULL\item Any attempt to call {\bf fish\_\-sound\_\-decode()}{\rm (p.\,\pageref{fishsound_8h_a7})} will return FISH\_\-SOUND\_\-ERR\_\-DISABLED\end{itemize}
-\subsubsection{Removing Vorbis support}\label{group__configuration_no_vorbis}
+\subsubsection{Removing Vorbis support}\label{no_vorbis}
Configuring with {\em --disable-vorbis\/} will remove all support for Vorbis:\begin{itemize}
\item All internal Vorbis related functions will not be built\item Any attempt to call {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} with {\em mode\/} == FISH\_\-SOUND\_\-ENCODE and {\em fsinfo-$>$format\/} == FISH\_\-SOUND\_\-VORBIS will fail, returning NULL\item The resulting library will not be linked against libvorbis or libvorbisenc\end{itemize}
-\subsubsection{Removing Speex support}\label{group__configuration_no_speex}
+\subsubsection{Removing Speex support}\label{no_speex}
Configuring with {\em --disable-speex\/} will remove all support for Speex:\begin{itemize}
\item All internal Speex related functions will not be built\item Any attempt to call {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} with {\em mode\/} == FISH\_\-SOUND\_\-ENCODE and {\em fsinfo-$>$format\/} == FISH\_\-SOUND\_\-SPEEX will fail, returning NULL\item The resulting library will not be linked against libspeex\end{itemize}
-\subsubsection{Configuration summary}\label{group__configuration_summary}
+\subsubsection{Configuration summary}\label{summary}
Upon successful configuration, you should see something like this: \small\begin{alltt}
------------------------------------------------------------------------
libfishsound 0.6.0: Automatic configuration OK.\end{alltt}\normalsize
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__decode.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__decode.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__decode.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -5,7 +5,7 @@
\item create a Fish\-Sound$\ast$ object with mode FISH\_\-SOUND\_\-DECODE. {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} will return a new Fish\-Sound$\ast$ object, initialised for decoding, and the {\bf Fish\-Sound\-Info}{\rm (p.\,\pageref{structFishSoundInfo})} structure will be cleared.\item provide a Fish\-Sound\-Decoded callback for libfishsound to call when it has decoded audio.\item (optionally) specify whether you want to receive interleaved or per-channel PCM data, using a {\bf fish\_\-sound\_\-set\_\-interleave()}{\rm (p.\,\pageref{fishsound_8h_a14})}. The default is for per-channel (non-interleaved) PCM.\item feed encoded audio data to libfishsound via {\bf fish\_\-sound\_\-decode()}{\rm (p.\,\pageref{fishsound_8h_a7})}. libfishsound will decode the audio for you, calling the Fish\-Sound\-Decoded callback you provided earlier each time it has a block of audio ready.\item when finished, call {\bf fish\_\-sound\_\-delete()}{\rm (p.\,\pageref{fishsound_8h_a11})}.\end{itemize}
-This procedure is illustrated in src/examples/decode.c. Note that this example additionally:\begin{itemize}
+This procedure is illustrated in src/examples/fishsound-decode.c. Note that this example additionally:\begin{itemize}
\item uses {\tt liboggz} to demultiplex audio data from an Ogg encapsulated Vorbis or Speex stream. Hence, the step of feeding encoded data to libfishsound is done within the Oggz\-Read\-Packet callback.\item uses {\tt libsndfile} to write the decoded audio to a WAV file.\end{itemize}
@@ -94,6 +94,7 @@
{
FishSound * fsound = (FishSound *)user_data;
+ fish_sound_prepare_truncation (fsound, op->granulepos, op->e_o_s);
fish_sound_decode (fsound, op->packet, op->bytes);
return 0;
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__encode.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__encode.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__encode.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -5,7 +5,7 @@
\item create a Fish\-Sound$\ast$ object with mode FISH\_\-SOUND\_\-ENCODE, and with a {\bf Fish\-Sound\-Info}{\rm (p.\,\pageref{structFishSoundInfo})} structure filled in with the required encoding parameters. {\bf fish\_\-sound\_\-new()}{\rm (p.\,\pageref{fishsound_8h_a4})} will return a new Fish\-Sound$\ast$ object initialised for encoding.\item provide a Fish\-Sound\-Encoded callback for libfishsound to call when it has a block of encoded audio\item (optionally) specify whether you will be providing interleaved or per-channel PCM data, using a {\bf fish\_\-sound\_\-set\_\-interleave()}{\rm (p.\,\pageref{fishsound_8h_a14})}. The default is for per-channel (non-interleaved) PCM.\item feed raw PCM audio data to libfishsound via {\bf fish\_\-sound\_\-encode()}{\rm (p.\,\pageref{fishsound_8h_a8})}. libfishsound will encode the audio for you, calling the Fish\-Sound\-Encoded callback you provided earlier each time it has a block of encoded audio ready.\item when finished, call {\bf fish\_\-sound\_\-delete()}{\
rm (p.\,\pageref{fishsound_8h_a11})}.\end{itemize}
-This procedure is illustrated in src/examples/encode.c. Note that this example additionally:\begin{itemize}
+This procedure is illustrated in src/examples/fishsound-encode.c. Note that this example additionally:\begin{itemize}
\item uses {\tt libsndfile} to read input from a PCM audio file (WAV, AIFF, etc.)\item uses {\tt liboggz} to encapsulate the encoded Vorbis or Speex data in an Ogg stream.\end{itemize}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__install.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__install.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__install.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,6 @@
\section{Installation}
\label{group__install}\index{Installation@{Installation}}
-\subsection{INSTALL}\label{group__install_install}
+\subsection{INSTALL}\label{install}
\footnotesize\begin{verbatim}Basic Installation
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__win32.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__win32.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/group__win32.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,6 @@
\section{Building on Win32}
\label{group__win32}\index{Building on Win32@{Building on Win32}}
-\subsection{README.Win32}\label{group__win32_win32}
+\subsection{README.Win32}\label{win32}
\footnotesize\begin{verbatim}The /Win32 directory contains everything necessary to compile
@@ -35,7 +35,11 @@
Visual Studio.NET 2003 Installation
===================================
+NOTE: For lack of platform, we were not able to keep the solution
+files up-to-date. Please use the Visual Studio Version 6 files
+instead or send us an updated version if you're using these.
+
IMPORTANT: The solution files were built for VS.NET 2003 and can't be
opened by VS.NET 2002. If you use VS.NET 2002 you should use the VS6
workspace files and they will be automatically converted to the new
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/index.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/index.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/index.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,14 +1,18 @@
-\section{Fish\-Sound, the sound of fish!}\label{index_intro}
+\section{Fish\-Sound, the sound of fish!}\label{intro}
This is the documentation for the Fish\-Sound C API. Fish\-Sound provides a simple programming interface for decoding and encoding audio data using Xiph.Org codecs (Vorbis and Speex).
libfishsound by itself is designed to handle raw codec streams from a lower level layer such as UDP datagrams. When these codecs are used in files, they are commonly encapsulated in {\tt Ogg} to produce {\em Ogg Vorbis\/} and {\em Speex\/} files. Example C programs using {\tt liboggz} to read and write these files are provided in the libfishsound sources.
-For more information on the design and history of libfishsound, see the {\bf About }{\rm (p.\,\pageref{group__about})} section of this documentation, and the {\tt libfishsound} homepage.\subsection{Contents}\label{index_contents}
+For more information on the design and history of libfishsound, see the {\bf About }{\rm (p.\,\pageref{group__about})} section of this documentation, and the {\tt libfishsound} homepage.\subsection{Contents}\label{contents}
\begin{itemize}
\item {\bf fishsound.h }{\rm (p.\,\pageref{fishsound_8h})}: Documentation of the Fish\-Sound API.\end{itemize}
\begin{itemize}
+\item {\bf Handling comments }{\rm (p.\,\pageref{comments_8h})}: How to add and retrieve {\em name\/} = {\em value\/} metadata in Vorbis and Speex streams.\end{itemize}
+
+
+\begin{itemize}
\item {\bf Decoding audio data }{\rm (p.\,\pageref{group__decode})}: How to decode audio data with Fish\-Sound, including source for a fully working Ogg Vorbis and Ogg Speex decoder.\end{itemize}
@@ -26,7 +30,7 @@
\begin{itemize}
\item {\bf About }{\rm (p.\,\pageref{group__about})}: Design, motivation, history and acknowledgements.\end{itemize}
-\section{Licensing}\label{index_Licensing}
+\section{Licensing}\label{Licensing}
libfishsound is provided under the following BSD-style open source license:
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/refman.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/refman.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/refman.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -15,11 +15,11 @@
\begin{titlepage}
\vspace*{7cm}
\begin{center}
-{\Large libfishsound Reference Manual\\[1ex]\large 0.6.0 }\\
+{\Large libfishsound Reference Manual\\[1ex]\large 0.6.2 }\\
\vspace*{1cm}
-{\large Generated by Doxygen 1.3.6-20040222}\\
+{\large Generated by Doxygen 1.3.5}\\
\vspace*{0.5cm}
-{\small Wed Mar 24 19:38:27 2004}\\
+{\small Fri May 21 14:41:24 2004}\\
\end{center}
\end{titlepage}
\clearemptydoublepage
@@ -44,10 +44,12 @@
\include{group__decode}
\include{group__encode}
\chapter{libfishsound Data Structure Documentation}
-\input{structFishSoundFormat}
+\input{structFishSoundComment}
+\include{structFishSoundFormat}
\include{structFishSoundInfo}
\chapter{libfishsound File Documentation}
-\input{constants_8h}
+\input{comments_8h}
+\include{constants_8h}
\include{fishsound_8h}
\printindex
\end{document}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/structFishSoundComment.tex
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/structFishSoundComment.tex 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/doc/libfishsound/latex/structFishSoundComment.tex 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,35 @@
+\section{Fish\-Sound\-Comment Struct Reference}
+\label{structFishSoundComment}\index{FishSoundComment@{FishSoundComment}}
+A comment.
+
+
+{\tt \#include $<$comments.h$>$}
+
+\subsection*{Data Fields}
+\begin{CompactItemize}
+\item
+char $\ast$ {\bf name}
+\begin{CompactList}\small\item\em The name of the comment, eg. \item\end{CompactList}\item
+char $\ast$ {\bf value}\label{structFishSoundComment_o1}
+
+\begin{CompactList}\small\item\em The value of the comment, as UTF-8. \item\end{CompactList}\end{CompactItemize}
+
+
+\subsection{Detailed Description}
+A comment.
+
+
+
+\subsection{Field Documentation}
+\index{FishSoundComment@{Fish\-Sound\-Comment}!name@{name}}
+\index{name@{name}!FishSoundComment@{Fish\-Sound\-Comment}}
+\subsubsection{\setlength{\rightskip}{0pt plus 5cm}char$\ast$ {\bf Fish\-Sound\-Comment::name}}\label{structFishSoundComment_o0}
+
+
+The name of the comment, eg.
+
+\char`\"{}AUTHOR\char`\"{}
+
+The documentation for this struct was generated from the following file:\begin{CompactItemize}
+\item
+{\bf comments.h}\end{CompactItemize}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -31,13 +33,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
ACLOCAL = @ACLOCAL@
@@ -45,12 +43,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -59,27 +61,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -93,41 +97,50 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
SUBDIRS = fishsound
+subdir = include
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu include/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mostlyclean-libtool:
+ -rm -f *.lo
+clean-libtool:
+ -rm -rf .libs _libs
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-
- at SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -147,13 +160,18 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- test "$$subdir" != "." || dot_seen=yes; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
done; \
- test "$$dot_seen" = "no" && rev=". $$rev"; \
+ rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -170,135 +188,169 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
+ fi; \
done; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-mostlyclean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-clean-tags:
-
distclean-tags:
- -rm -f TAGS ID
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-maintainer-clean-tags:
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = include
-
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
- for subdir in $(SUBDIRS); do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
- chmod 777 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
+ distdir) \
|| exit 1; \
fi; \
done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
check-am: all-am
check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
install-exec: install-exec-recursive
-
-install-data-am:
install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
+
+installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-tags mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic clean-libtool mostlyclean-am
-clean-am: clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
-clean: clean-recursive
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
-distclean-am: distclean-tags distclean-generic clean-am
- -rm -f libtool
+dvi: dvi-recursive
-distclean: distclean-recursive
+dvi-am:
-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-recursive
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-recursive
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-recursive
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-libtool clean-recursive distclean \
+ distclean-generic distclean-libtool distclean-recursive \
+ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-man install-recursive \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am installdirs-recursive maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-recursive
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.am 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.am 2004-05-25 14:19:54 UTC (rev 6754)
@@ -2,5 +2,5 @@
# Include files to install
includedir = $(prefix)/include/fishsound
-include_HEADERS = fishsound.h constants.h
+include_HEADERS = fishsound.h comments.h constants.h
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,9 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# Include files to install
-
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -32,13 +32,9 @@
infodir = @infodir@
mandir = @mandir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ../..
ACLOCAL = @ACLOCAL@
@@ -46,12 +42,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -60,27 +60,32 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+
+# Include files to install
+includedir = $(prefix)/include/fishsound
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -94,155 +99,195 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
-
-includedir = $(prefix)/include/fishsound
-include_HEADERS = fishsound.h constants.h
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+include_HEADERS = fishsound.h comments.h constants.h
+subdir = include/fishsound
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES =
-HEADERS = $(include_HEADERS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+HEADERS = $(include_HEADERS)
-DIST_COMMON = Makefile.am Makefile.in
+DIST_COMMON = $(include_HEADERS) Makefile.am Makefile.in
+all: all-am
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/fishsound/Makefile
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu include/fishsound/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mostlyclean-libtool:
+ -rm -f *.lo
+clean-libtool:
+ -rm -rf .libs _libs
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+includeHEADERS_INSTALL = $(INSTALL_HEADER)
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
- if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
- echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
- $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
+ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
- list='$(include_HEADERS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(includedir)/$$p; \
+ @list='$(include_HEADERS)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f $(DESTDIR)$(includedir)/$$f"; \
+ rm -f $(DESTDIR)$(includedir)/$$f; \
done
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-mostlyclean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-clean-tags:
-
distclean-tags:
- -rm -f TAGS ID
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-maintainer-clean-tags:
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = include/fishsound
-
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(HEADERS)
+
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(includedir)
+
+install: install-am
install-exec: install-exec-am
-
-install-data-am: install-includeHEADERS
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-includeHEADERS
-uninstall: uninstall-am
-all-am: Makefile $(HEADERS)
-all-redirect: all-am
+
+installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(includedir)
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-tags mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
-clean-am: clean-tags clean-generic mostlyclean-am
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
-distclean-am: distclean-tags distclean-generic clean-am
- -rm -f libtool
+dvi: dvi-am
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+info-am:
+
+install-data-am: install-includeHEADERS
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-am
-.PHONY: uninstall-includeHEADERS install-includeHEADERS tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-includeHEADERS uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool distclean distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-includeHEADERS install-info \
+ install-info-am install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool tags uninstall uninstall-am \
+ uninstall-includeHEADERS uninstall-info-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/comments.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/comments.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/comments.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,212 @@
+
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __FISH_SOUND_COMMENT_H__
+#define __FISH_SOUND_COMMENT_H__
+
+/** \file
+ * Encoding and decoding of comments.
+ *
+ * Vorbis and Speex bitstreams
+ * use a comment format called "Vorbiscomment", defined
+ * here.
+ * Many standard comment names (such as TITLE, COPYRIGHT and GENRE) are
+ * defined in that document.
+ *
+ * The following general features of Vorbiscomment are relevant to this API:
+ * - Each stream has one comment packet, which occurs before any encoded
+ * audio data in the stream.
+ * - When encoding, FishSound will generate the comment block and pass it
+ * to the encoded() callback in sequence, just like any other packet.
+ * Hence, all comments must be set before any call to fish_sound_encode().
+ * - When decoding, FishSound will decode the comment block before calling
+ * the first decoded() callback. Hence, retrieving comment data is possible
+ * from as soon as the decoded() callback is first called.
+ *
+ * Each comment block contains one Vendor string, which can be retrieved
+ * with fish_sound_comment_get_vendor(). When encoding, this string is
+ * effectively fixed by the codec libraries; it cannot be set by the
+ * application.
+ *
+ * The rest of a comment block consists of \a name = \a value pairs, with
+ * the following restrictions:
+ * - Both the \a name and \a value must be non-empty
+ * - The \a name is case-insensitive and must consist of ASCII within the
+ * range 0x20 to 0x7D inclusive, 0x3D ('=') excluded.
+ * - The \a name is not unique; multiple entries may exist with equivalent
+ * \a name within a Vorbiscomment block.
+ * - The \a value may be any UTF-8 string.
+ *
+ * \section comments_get Retrieving comments
+ *
+ * FishSound contains API methods to iterate through all comments associated
+ * with a FishSound* handle (fish_sound_comment_first() and
+ * fish_sound_comment_next(), and to iterate through comments matching a
+ * particular name (fish_sound_comment_first_byname() and
+ * fish_sound_comment_next_byname()). Given that multiple comments may exist
+ * with the same \a name, you should not use
+ * fish_sound_comment_first_byname() as a simple "get" function.
+ *
+ * \section comments_set Encoding comments
+ *
+ * For encoding, FishSound contains API methods for adding comments
+ * (fish_sound_comment_add() and fish_sound_comment_add_byname()
+ * and for removing comments
+ * (fish_sound_comment_remove() and fish_sound_comment_remove_byname()).
+ */
+
+#include <fishsound/fishsound.h>
+
+/**
+ * A comment.
+ */
+typedef struct {
+ /** The name of the comment, eg. "AUTHOR" */
+ char * name;
+
+ /** The value of the comment, as UTF-8 */
+ char * value;
+} FishSoundComment;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * Retrieve the vendor string.
+ * \param fsound A FishSound* handle
+ * \returns A read-only copy of the vendor string
+ * \retval NULL No vendor string is associated with \a fsound,
+ * or \a fsound is NULL.
+ */
+const char *
+fish_sound_comment_get_vendor (FishSound * fsound);
+
+
+/**
+ * Retrieve the first comment.
+ * \param fsound A FishSound* handle
+ * \returns A read-only copy of the first comment, or NULL if no comments
+ * exist for this FishSound* object.
+ */
+const FishSoundComment *
+fish_sound_comment_first (FishSound * fsound);
+
+/**
+ * Retrieve the next comment.
+ * \param fsound A FishSound* handle
+ * \param comment The previous comment.
+ * \returns A read-only copy of the comment immediately following the given
+ * comment.
+ */
+const FishSoundComment *
+fish_sound_comment_next (FishSound * fsound, const FishSoundComment * comment);
+
+/**
+ * Retrieve the first comment with a given name.
+ * \param fsound A FishSound* handle
+ * \param name the name of the comment to retrieve.
+ * \returns A read-only copy of the first comment matching the given \a name.
+ * \retval NULL no match was found.
+ * \note If \a name is NULL, the behaviour is the same as for
+ * fish_sound_comment_first()
+ */
+const FishSoundComment *
+fish_sound_comment_first_byname (FishSound * fsound, char * name);
+
+/**
+ * Retrieve the next comment following and with the same name as a given
+ * comment.
+ * \param fsound A FishSound* handle
+ * \param comment A comment
+ * \returns A read-only copy of the next comment with the same name as
+ * \a comment.
+ * \retval NULL no further comments with the same name exist for
+ * this FishSound* object.
+ */
+const FishSoundComment *
+fish_sound_comment_next_byname (FishSound * fsound,
+ const FishSoundComment * comment);
+
+/**
+ * Add a comment
+ * \param fsound A FishSound* handle (created with mode FISH_SOUND_ENCODE)
+ * \param comment The comment to add
+ * \retval 0 Success
+ * \retval FISH_SOUND_ERR_BAD \a fsound is not a valid FishSound* handle
+ * \retval FISH_SOUND_ERR_INVALID Operation not suitable for this FishSound
+ */
+int
+fish_sound_comment_add (FishSound * fsound, FishSoundComment * comment);
+
+/**
+ * Add a comment by name and value.
+ * \param fsound A FishSound* handle (created with mode FISH_SOUND_ENCODE)
+ * \param name The name of the comment to add
+ * \param value The contents of the comment to add
+ * \retval 0 Success
+ * \retval FISH_SOUND_ERR_BAD \a fsound is not a valid FishSound* handle
+ * \retval FISH_SOUND_ERR_INVALID Operation not suitable for this FishSound
+ */
+int
+fish_sound_comment_add_byname (FishSound * fsound, const char * name,
+ const char * value);
+
+/**
+ * Remove a comment
+ * \param fsound A FishSound* handle (created with FISH_SOUND_ENCODE)
+ * \param comment The comment to remove.
+ * \retval 1 Success: comment removed
+ * \retval 0 No-op: comment not found, nothing to remove
+ * \retval FISH_SOUND_ERR_BAD \a fsound is not a valid FishSound* handle
+ * \retval FISH_SOUND_ERR_INVALID Operation not suitable for this FishSound
+ */
+int
+fish_sound_comment_remove (FishSound * fsound, FishSoundComment * comment);
+
+/**
+ * Remove all comments with a given name.
+ * \param fsound A FishSound* handle (created with FISH_SOUND_ENCODE)
+ * \param name The name of the comments to remove
+ * \retval ">= 0" The number of comments removed
+ * \retval FISH_SOUND_ERR_BAD \a fsound is not a valid FishSound* handle
+ * \retval FISH_SOUND_ERR_INVALID Operation not suitable for this FishSound
+ */
+int
+fish_sound_comment_remove_byname (FishSound * fsound, char * name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __FISH_SOUND_COMMENTS_H__ */
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/constants.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/constants.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/constants.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -63,9 +63,6 @@
/** No operation */
FISH_SOUND_COMMAND_NOP = 0x0000,
- //Zen's hack
- VORBIS_TELL_GRANULE_POS = 7,
- SPEEX_TELL_GRANULE_POS = 8,
/** Retrieve the FishSoundInfo */
FISH_SOUND_GET_INFO = 0x1000,
@@ -76,9 +73,7 @@
FISH_SOUND_SET_INTERLEAVE = 0x2001,
FISH_SOUND_SET_ENCODE_VBR = 0x4000,
-
-
FISH_SOUND_COMMAND_MAX
} FishSoundCommand;
@@ -87,11 +82,23 @@
/** No error */
FISH_SOUND_OK = 0,
+ /** generic error */
+ FISH_SOUND_ERR_GENERIC = -1,
+
+ /** Not a valid FishSound* handle */
+ FISH_SOUND_ERR_BAD = -2,
+
+ /** The requested operation is not suitable for this FishSound* handle */
+ FISH_SOUND_ERR_INVALID = -3,
+
/** Functionality disabled at build time */
FISH_SOUND_ERR_DISABLED = -10,
/** Too few bytes passed to fish_sound_identify() */
- FISH_SOUND_ERR_SHORT_IDENTIFY = -20
+ FISH_SOUND_ERR_SHORT_IDENTIFY = -20,
+
+ /** Comment violates VorbisComment restrictions */
+ FISH_SOUND_ERR_COMMENT_INVALID = -21
} FishSoundError;
#endif /* __FISH_SOUND_CONSTANTS_H__ */
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/fishsound.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/fishsound.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/include/fishsound/fishsound.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -62,6 +62,10 @@
* - \link fishsound.h fishsound.h \endlink:
* Documentation of the FishSound API.
*
+ * - \link comments.h Handling comments \endlink:
+ * How to add and retrieve \a name = \a value metadata in Vorbis and Speex
+ * streams.
+ *
* - \link decode Decoding audio data \endlink:
* How to decode audio data with FishSound, including source for a fully
* working Ogg Vorbis and Ogg Speex decoder.
@@ -331,8 +335,8 @@
* callback you provided earlier each time it has a block of audio ready.
* - when finished, call fish_sound_delete().
*
- * This procedure is illustrated in src/examples/decode.c. Note that this
- * example additionally:
+ * This procedure is illustrated in src/examples/fishsound-decode.c.
+ * Note that this example additionally:
* - uses liboggz to
* demultiplex audio data from an Ogg encapsulated Vorbis or Speex stream.
* Hence, the step of feeding encoded data to libfishsound is done within
@@ -343,7 +347,7 @@
* Hence this example code demonstrates all that is needed to decode both
* Ogg Vorbis and Ogg Speex files:
*
- * \include decode.c
+ * \include fishsound-decode.c
*/
/** \defgroup encode Encoding audio data
@@ -365,8 +369,8 @@
* ready.
* - when finished, call fish_sound_delete().
*
- * This procedure is illustrated in src/examples/encode.c. Note that this
- * example additionally:
+ * This procedure is illustrated in src/examples/fishsound-encode.c.
+ * Note that this example additionally:
* - uses libsndfile to
* read input from a PCM audio file (WAV, AIFF, etc.)
* - uses liboggz to
@@ -375,7 +379,7 @@
* Hence this example code demonstrates all that is needed to encode
* Ogg Vorbis and Ogg Speex files:
*
- * \include encode.c
+ * \include fishsound-encode.c
*/
/**
@@ -440,6 +444,10 @@
typedef int (*FishSoundEncoded) (FishSound * fsound, unsigned char * buf,
long bytes, void * user_data);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* Identify a codec based on the first few bytes of data.
* \param buf A pointer to the first few bytes of the data
@@ -519,7 +527,11 @@
long fish_sound_flush (FishSound * fsound);
/**
- * Reset the codec state of a FishSound object
+ * Reset the codec state of a FishSound object.
+ *
+ * When decoding from a seekable file, fish_sound_reset() should be called
+ * after any seek operations. See also fish_sound_set_frameno().
+ *
* \param fsound A FishSound* handle
* \returns 0 on success, -1 on failure
*/
@@ -563,4 +575,77 @@
*/
int fish_sound_set_interleave (FishSound * fsound, int interleave);
+/**
+ * Query the current frame number of a FishSound object.
+ *
+ * For decoding, this is the greatest frame index that has been decoded and
+ * made available to a FishSoundDecoded callback. This function is safe to
+ * call from within a FishSoundDecoded callback, and corresponds to the frame
+ * number of the last frame in the current decoded block.
+ *
+ * For encoding, this is the greatest frame index that has been encoded. This
+ * function is safe to call from within a FishSoundEncoded callback, and
+ * corresponds to the frame number of the last frame encoded in the current
+ * block.
+ *
+ * \param fsound A FishSound* handle
+ * \returns The current frame number
+ * \retval -1 Invalid \a fsound
+ */
+long fish_sound_get_frameno (FishSound * fsound);
+
+/**
+ * Set the current frame number of a FishSound object.
+ *
+ * When decoding from a seekable file, fish_sound_set_frameno() should be
+ * called after any seek operations, otherwise the value returned by
+ * fish_sound_get_frameno() will simply continue to increment. See also
+ * fish_sound_reset().
+ *
+ * \param fsound A FishSound* handle
+ * \param frameno The current frame number.
+ * \retval 0 Success
+ * \retval -1 Invalid \a fsound
+ */
+int fish_sound_set_frameno (FishSound * fsound, long frameno);
+
+/**
+ * Prepare truncation details for the next block of data.
+ * The semantics of these parameters derives directly from Ogg encapsulation
+ * of Vorbis, described
+ * here.
+ *
+ * When decoding from Ogg, you should call this function with the \a granulepos
+ * and \a eos of the \a ogg_packet structure. This call should be made before
+ * passing the packet's data to fish_sound_decode(). Failure to do so may
+ * result in minor decode errors on the first and/or last packet of the stream.
+ *
+ * When encoding into Ogg, you should call this function with the \a granulepos
+ * and \a eos that will be used for the \a ogg_packet structure. This call
+ * should be made before passing the block of audio data to
+ * fish_sound_encode(). Failure to do so may result in minor encoding errors
+ * on the first and/or last packet of the stream.
+ *
+ * \param fsound A FishSound* handle
+ * \param next_granulepos The "granulepos" for the next block to decode.
+ * If unknown, set \a next_granulepos to -1. Otherwise,
+ * \a next_granulepos specifies the frameno of the final frame in the
+ * block. This is authoritative, hence can be used to indicate
+ * various forms of truncation at the beginning or end of a stream.
+ * Mid-stream, a later-than-expected "granulepos" indicates that some
+ * data was missing.
+ * \param next_eos A boolean indicating whether the next data block will be
+ * the last in the stream.
+ * \retval 0 Success
+ * \retval -1 Invalid \a fsound
+ */
+int fish_sound_prepare_truncation (FishSound * fsound, long next_granulepos,
+ int next_eos);
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <fishsound/comments.h>
+
#endif /* __FISH_SOUND_H__ */
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/install-sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/install-sh 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/install-sh 2004-05-25 14:19:54 UTC (rev 6754)
@@ -109,7 +109,7 @@
echo "install: no input file specified"
exit 1
else
- true
+ :
fi
if [ x"$dir_arg" != x ]; then
@@ -120,7 +120,7 @@
instcmd=:
chmodcmd=""
else
- instcmd=mkdir
+ instcmd=$mkdirprog
fi
else
@@ -128,9 +128,9 @@
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
- if [ -f $src -o -d $src ]
+ if [ -f "$src" ] || [ -d "$src" ]
then
- true
+ :
else
echo "install: $src does not exist"
exit 1
@@ -141,7 +141,7 @@
echo "install: no destination specified"
exit 1
else
- true
+ :
fi
# If destination is a directory, append the input filename; if your system
@@ -151,7 +151,7 @@
then
dst="$dst"/`basename $src`
else
- true
+ :
fi
fi
@@ -163,8 +163,8 @@
# Skip lots of stat calls in the usual case.
if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
+defaultIFS='
+ '
IFS="${IFS-${defaultIFS}}"
oIFS="${IFS}"
@@ -183,7 +183,7 @@
then
$mkdirprog "${pathcomp}"
else
- true
+ :
fi
pathcomp="${pathcomp}/"
@@ -194,10 +194,10 @@
then
$doit $instcmd $dst &&
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
else
# If we're going to rename the final executable, determine the name now.
@@ -216,7 +216,7 @@
then
dstfile=`basename $dst`
else
- true
+ :
fi
# Make a temp file name in the proper directory.
@@ -235,10 +235,10 @@
# ignore errors from any of these, just make sure not to ignore
# errors from the above "$doit $instcmd $src $dsttmp" command.
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+ if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
+ if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
+ if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
+ if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
# Now rename the file to the real destination.
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/ltmain.sh
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/ltmain.sh 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/ltmain.sh 2004-05-25 14:19:54 UTC (rev 6754)
@@ -55,8 +55,8 @@
# Constants.
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.2
-TIMESTAMP=" (1.1220.2.60 2004/01/25 12:25:08) Debian$Rev: 192 $"
+VERSION=1.5
+TIMESTAMP=" (1.1220 2003/04/05 19:32:58)"
default_mode=
help="Try \`$progname --help' for more information."
@@ -70,8 +70,8 @@
Xsed="${SED}"' -e 1s/^X//'
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
+case `echo A|od -x` in
+ *[Cc]1*) # EBCDIC based system
SP2NL="tr '\100' '\n'"
NL2SP="tr '\r\n' '\100\100'"
;;
@@ -94,8 +94,7 @@
fi
# Make sure IFS has a sensible default
-: ${IFS="
-"}
+: ${IFS=" "}
if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
$echo "$modename: not configured to build any kind of library" 1>&2
@@ -177,7 +176,6 @@
;;
tag)
tagname="$arg"
- preserve_args="${preserve_args}=$arg"
# Check whether tagname contains only valid characters
case $tagname in
@@ -240,7 +238,6 @@
--debug)
$echo "$progname: enabling shell trace mode"
set -x
- preserve_args="$preserve_args $arg"
;;
--dry-run | -n)
@@ -271,7 +268,6 @@
--quiet | --silent)
show=:
- preserve_args="$preserve_args $arg"
;;
--tag) prevopt="--tag" prev=tag ;;
@@ -279,7 +275,6 @@
set tag "$optarg" ${1+"$@"}
shift
prev=tag
- preserve_args="$preserve_args --tag"
;;
-dlopen)
@@ -312,6 +307,23 @@
exec_cmd=
if test -z "$show_help"; then
+ archargs=
+ case $host in
+ *-*-darwin*)
+ # For darwin, separate arch arguments and apply them to all compile/link
+ # commands
+ doarch=
+ for arg; do
+ if test -n "$doarch"; then
+ archargs="$archargs -arch $arg"
+ doarch=
+ continue
+ fi
+ case $arg in
+ -arch) doarch=y;;
+ esac
+ done
+ esac
# Infer the operation mode.
if test -z "$mode"; then
@@ -374,11 +386,9 @@
# Get the compilation command and the source file.
base_compile=
srcfile="$nonopt" # always keep a non-empty value in "srcfile"
- suppress_opt=yes
suppress_output=
arg_mode=normal
libobj=
- later=
for arg
do
@@ -407,16 +417,21 @@
continue
;;
- -static | -prefer-pic | -prefer-non-pic)
- later="$later $arg"
+ -static)
+ build_old_libs=yes
continue
;;
- -no-suppress)
- suppress_opt=no
+ -prefer-pic)
+ pic_mode=yes
continue
;;
+ -prefer-non-pic)
+ pic_mode=no
+ continue
+ ;;
+
-Xcompiler)
arg_mode=arg # the next one goes into the "base_compile" arg list
continue # The current "srcfile" will either be retained or
@@ -558,25 +573,6 @@
esac
fi
- for arg in $later; do
- case $arg in
- -static)
- build_old_libs=yes
- continue
- ;;
-
- -prefer-pic)
- pic_mode=yes
- continue
- ;;
-
- -prefer-non-pic)
- pic_mode=no
- continue
- ;;
- esac
- done
-
objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
@@ -743,9 +739,7 @@
EOF
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
- suppress_output=' >/dev/null 2>&1'
- fi
+ suppress_output=' >/dev/null 2>&1'
else
# No PIC object so indicate it doesn't exist in the libtool
# object file.
@@ -858,7 +852,7 @@
;;
esac
libtool_args="$nonopt"
- base_compile="$nonopt $@"
+ base_compile="$nonopt"
compile_command="$nonopt"
finalize_command="$nonopt"
@@ -890,7 +884,6 @@
no_install=no
objs=
non_pic_objects=
- precious_files_regex=
prefer_static_libs=no
preload=no
prev=
@@ -904,47 +897,6 @@
vinfo=
vinfo_number=no
- # Infer tagged configuration to use if any are available and
- # if one wasn't chosen via the "--tag" command line option.
- # Only attempt this if the compiler in the base link
- # command doesn't match the default compiler.
- if test -n "$available_tags" && test -z "$tagname"; then
- case $base_compile in
- # Blanks in the command may have been stripped by the calling shell,
- # but not from the CC environment variable when configure was run.
- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
- # Blanks at the start of $base_compile will cause this to fail
- # if we don't check for them as well.
- *)
- for z in $available_tags; do
- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
- # Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
- case $base_compile in
- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
- # The compiler in $compile_command matches
- # the one in the tagged configuration.
- # Assume this is the tagged configuration we want.
- tagname=$z
- break
- ;;
- esac
- fi
- done
- # If $tagname still isn't set, then no tagged configuration
- # was found and let the user know that the "--tag" command
- # line option must be used.
- if test -z "$tagname"; then
- $echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit 1
-# else
-# $echo "$modename: using $tagname tagged configuration"
- fi
- ;;
- esac
- fi
-
# We need to know -static, to get the right output filenames.
for arg
do
@@ -976,6 +928,7 @@
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
arg="$1"
+ base_compile="$base_compile $arg"
shift
case $arg in
*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
@@ -1054,11 +1007,6 @@
prev=
continue
;;
- precious_regex)
- precious_files_regex="$arg"
- prev=
- continue
- ;;
release)
release="-$arg"
prev=
@@ -1356,11 +1304,6 @@
continue
;;
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
- deplibs="$deplibs $arg"
- continue
- ;;
-
-module)
module=yes
continue
@@ -1425,11 +1368,6 @@
-o) prev=output ;;
- -precious-files-regex)
- prev=precious_regex
- continue
- ;;
-
-release)
prev=release
continue
@@ -1698,6 +1636,47 @@
exit 1
fi
+ # Infer tagged configuration to use if any are available and
+ # if one wasn't chosen via the "--tag" command line option.
+ # Only attempt this if the compiler in the base link
+ # command doesn't match the default compiler.
+ if test -n "$available_tags" && test -z "$tagname"; then
+ case $base_compile in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+ "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+ case $base_compile in
+ "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+ # The compiler in $compile_command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+ tagname=$z
+ break
+ ;;
+ esac
+ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+ $echo "$modename: specify a tag with \`--tag'" 1>&2
+ exit 1
+# else
+# $echo "$modename: using $tagname tagged configuration"
+ fi
+ ;;
+ esac
+ fi
+
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
compile_command="$compile_command $arg"
@@ -1840,15 +1819,6 @@
lib=
found=no
case $deplib in
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- fi
- continue
- ;;
-l*)
if test "$linkmode" != lib && test "$linkmode" != prog; then
$echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
@@ -1860,18 +1830,12 @@
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
- for search_ext in .la $shrext .so .a; do
- # Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
- if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
- else
- found=no
- fi
- break 2
- fi
- done
+ # Search the libtool library
+ lib="$searchdir/lib${name}.la"
+ if test -f "$lib"; then
+ found=yes
+ break
+ fi
done
if test "$found" != yes; then
# deplib doesn't seem to be a libtool library
@@ -2331,11 +2295,10 @@
if test -f "$output_objdir/$soname-def"; then :
else
$show "extracting exported symbol list from \`$soname'"
- save_ifs="$IFS"; IFS='~'
- cmds=$extract_expsyms_cmds
+ save_ifs="$IFS"; IFS=$_S_
+ eval cmds=\"$extract_expsyms_cmds\"
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -2345,11 +2308,10 @@
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
$show "generating import library for \`$soname'"
- save_ifs="$IFS"; IFS='~'
- cmds=$old_archive_from_expsyms_cmds
+ save_ifs="$IFS"; IFS=$_S_
+ eval cmds=\"$old_archive_from_expsyms_cmds\"
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -2407,7 +2369,7 @@
if test -n "$inst_prefix_dir"; then
case "$libdir" in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
;;
esac
fi
@@ -2479,7 +2441,7 @@
if test -n "$inst_prefix_dir"; then
case "$libdir" in
[\\/]*)
- add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ add_dir="-L$inst_prefix_dir$libdir $add_dir"
;;
esac
fi
@@ -2623,13 +2585,9 @@
if test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
fi
- # do not add paths which are already there
- case " $newlib_search_path " in
- *" $path "*) ;;
- *) newlib_search_path="$newlib_search_path $path";;
- esac
+ newlib_search_path="$newlib_search_path $path"
+ path=""
fi
- path=""
;;
*)
path="-L$path"
@@ -3097,10 +3055,6 @@
*.$objext)
;;
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
- then
- continue
- fi
removelist="$removelist $p"
;;
*) ;;
@@ -3221,7 +3175,7 @@
int main() { return 0; }
EOF
$rm conftest
- $LTCC -o conftest conftest.c $deplibs
+ $LTCC $archargs -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
for i in $deplibs; do
@@ -3266,7 +3220,7 @@
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
- $LTCC -o conftest conftest.c $i
+ $LTCC $archargs -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
ldd_output=`ldd conftest`
@@ -3610,11 +3564,10 @@
$show "generating symbol list for \`$libname.la'"
export_symbols="$output_objdir/$libname.exp"
$run $rm $export_symbols
- cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$export_symbols_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd"
@@ -3684,34 +3637,80 @@
if test "$status" -ne 0 && test ! -d "$xdir"; then
exit $status
fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
+ case $host in
+ *-*-darwin*)
+ # ranlib-ed archives of fat binaries are converted to a fat xabs that
+ # ar can't use. So we to split the fat xabs into non-fat ones to unpack.
+ # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work.
+ d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'`
+ if test -n "$d_archs"; then
+ $echo "$modename: manually unpacking fat archive $xabs" 1>&2
+ d_name=`basename $xabs`
+ d_dir="/tmp/fat_ar.$$"
+ d_files=''
+
+ for d_arch in $d_archs; do
+ d_archdir="$d_dir/$d_arch"
+ $show "$mkdir -p $d_archdir"
+ $run $mkdir -p "$d_archdir"
+
+ $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name"
+ $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name"
+
+ $show "(cd $d_archdir && $AR x $d_dir/$d_name)"
+ $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $?
+
+ $show "${rm} $d_dir/$d_name"
+ $run ${rm} "$d_dir/$d_name"
+ done
+
+ # Can't deal with blanks in file names
+ $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' | sort -u\`" || exit $?
+
+ for d_file in $d_files; do
+ $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $?
+ $show "lipo -create $d_f -o $xdir/$d_file"
+ $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $?
+ done
+
+ $show "${rm}r $d_dir"
+ $run ${rm}r "$d_dir"
+ else
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ fi
+ ;;
+ *)
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
done
- done
- fi
+ fi
+ ;;
+ esac
libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
done
@@ -3731,23 +3730,19 @@
# Do each of the archive commands.
if test "$module" = yes && test -n "$module_cmds" ; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- eval test_cmds=\"$module_expsym_cmds\"
- cmds=$module_expsym_cmds
+ eval cmds=\"$module_expsym_cmds\"
else
- eval test_cmds=\"$module_cmds\"
- cmds=$module_cmds
+ eval cmds=\"$module_cmds\"
fi
else
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- eval test_cmds=\"$archive_expsym_cmds\"
- cmds=$archive_expsym_cmds
+ eval cmds=\"$archive_expsym_cmds\"
else
- eval test_cmds=\"$archive_cmds\"
- cmds=$archive_cmds
+ eval cmds=\"$archive_cmds\"
fi
fi
- if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+ if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
:
else
@@ -3793,7 +3788,7 @@
else
# All subsequent reloadable object files will link in
# the last one created.
- eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ eval concat_cmds=\"\$concat_cmds${_S_}$reload_cmds $objlist $last_robj\"
fi
last_robj=$output_objdir/$save_output-${k}.$objext
k=`expr $k + 1`
@@ -3805,7 +3800,7 @@
# Handle the remaining objects by creating one last
# reloadable object file. All subsequent reloadable object
# files will link in the last one created.
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds${_S_}
eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
if ${skipped_export-false}; then
@@ -3814,7 +3809,7 @@
$run $rm $export_symbols
libobjs=$output
# Append the command to create the export file.
- eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ eval concat_cmds=\"\$concat_cmds${_S_}$export_symbols_cmds\"
fi
# Set up a command to remove the reloadale object files
@@ -3829,10 +3824,9 @@
$echo "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $concat_cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -3849,28 +3843,19 @@
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
- if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
- cmds=$module_expsym_cmds
- else
- cmds=$module_cmds
- fi
- else
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- cmds=$archive_expsym_cmds
+ eval cmds=\"$archive_expsym_cmds\"
else
- cmds=$archive_cmds
- fi
+ eval cmds=\"$archive_cmds\"
fi
# Append the command to remove the reloadable object files
# to the just-reset $cmds.
- eval cmds=\"\$cmds~\$rm $delfiles\"
+ eval cmds=\"\$cmds${_S_}$rm $delfiles\"
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -3983,34 +3968,80 @@
if test "$status" -ne 0 && test ! -d "$xdir"; then
exit $status
fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
+ case $host in
+ *-*-darwin*)
+ # ranlib-ed archives of fat binaries are converted to a fat xabs that
+ # ar can't use. So we to split the fat xabs into non-fat ones to unpack.
+ # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work.
+ d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'`
+ if test -n "$d_archs"; then
+ $echo "$modename: manually unpacking fat archive $xabs" 1>&2
+ d_name=`basename $xabs`
+ d_dir="/tmp/fat_ar.$$"
+ d_files=''
+
+ for d_arch in $d_archs; do
+ d_archdir="$d_dir/$d_arch"
+ $show "$mkdir -p $d_archdir"
+ $run $mkdir -p "$d_archdir"
+
+ $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name"
+ $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name"
+
+ $show "(cd $d_archdir && $AR x $d_dir/$d_name)"
+ $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $?
+
+ $show "${rm} $d_dir/$d_name"
+ $run ${rm} "$d_dir/$d_name"
+ done
+
+ # Can't deal with blanks in file names
+ $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' | sort -u\`" || exit $?
+
+ for d_file in $d_files; do
+ $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $?
+ $show "lipo -create $d_f -o $xdir/$d_file"
+ $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $?
+ done
+
+ $show "${rm}r $d_dir"
+ $run ${rm}r "$d_dir"
+ else
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ fi
+ ;;
+ *)
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
done
- done
- fi
+ fi
+ ;;
+ esac
reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
done
@@ -4021,11 +4052,10 @@
reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
output="$obj"
- cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$reload_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -4058,11 +4088,10 @@
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
output="$libobj"
- cmds=$reload_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$reload_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -4379,8 +4408,8 @@
esac
# Now compile the dynamic symbol file.
- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ $show "(cd $output_objdir && $LTCC $archargs -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $LTCC $archargs -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
# Clean up the generated files.
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
@@ -4769,7 +4798,7 @@
# are only useful if you want to execute the "real" binary.
# Since the "real" binary is built for $host, then this
# wrapper might as well be built for $host, too.
- $run $LTCC -s -o $cwrapper $cwrappersource
+ $run $LTCC $archargs -s -o $cwrapper $cwrappersource
;;
esac
$rm $output
@@ -4999,34 +5028,80 @@
if test "$status" -ne 0 && test ! -d "$xdir"; then
exit $status
fi
- # We will extract separately just the conflicting names and we will no
- # longer touch any unique names. It is faster to leave these extract
- # automatically by $AR in one run.
- $show "(cd $xdir && $AR x $xabs)"
- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
- :
- else
- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
- $AR t "$xabs" | sort | uniq -cd | while read -r count name
- do
- i=1
- while test "$i" -le "$count"
+ case $host in
+ *-*-darwin*)
+ # ranlib-ed archives of fat binaries are converted to a fat xabs that
+ # ar can't use. So we to split the fat xabs into non-fat ones to unpack.
+ # We can't deal with duplicate names, since 'ar xN' and 'uniq -cd' don't work.
+ d_archs=`lipo -info $xabs 2> /dev/null | grep '^Architectures' | sed 's/^.*: //'`
+ if test -n "$d_archs"; then
+ $echo "$modename: manually unpacking fat archive $xabs" 1>&2
+ d_name=`basename $xabs`
+ d_dir="/tmp/fat_ar.$$"
+ d_files=''
+
+ for d_arch in $d_archs; do
+ d_archdir="$d_dir/$d_arch"
+ $show "$mkdir -p $d_archdir"
+ $run $mkdir -p "$d_archdir"
+
+ $show "lipo -thin $d_arch $xabs -o $d_dir/$d_name"
+ $run lipo -thin $d_arch "$xabs" -o "$d_dir/$d_name"
+
+ $show "(cd $d_archdir && $AR x $d_dir/$d_name)"
+ $run eval "(cd \$d_archdir && \$AR x \$d_dir/\$d_name)" || exit $?
+
+ $show "${rm} $d_dir/$d_name"
+ $run ${rm} "$d_dir/$d_name"
+ done
+
+ # Can't deal with blanks in file names
+ $run eval "d_files=\`find \$d_dir -type f | sed -e 's,.*/,,' -e '/ /d' | sort -u\`" || exit $?
+
+ for d_file in $d_files; do
+ $run eval "d_f=\`find \$d_dir -name \$d_file -print\`" || exit $?
+ $show "lipo -create $d_f -o $xdir/$d_file"
+ $run eval "lipo -create \$d_f -o \"\$xdir/\$d_file\"" || exit $?
+ done
+
+ $show "${rm}r $d_dir"
+ $run ${rm}r "$d_dir"
+ else
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ fi
+ ;;
+ *)
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
do
- # Put our $i before any first dot (extension)
- # Never overwrite any file
- name_to="$name"
- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
- do
- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
- done
- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
- i=`expr $i + 1`
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
done
- done
- fi
+ fi
+ ;;
+ esac
oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
done
@@ -5034,13 +5109,13 @@
# Do each command in the archive commands.
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
- cmds=$old_archive_from_new_cmds
+ eval cmds=\"$old_archive_from_new_cmds\"
else
eval cmds=\"$old_archive_cmds\"
if len=`expr "X$cmds" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
- cmds=$old_archive_cmds
+ :
else
# the command line is too long to link in one step, link in parts
$echo "using piecewise archive linking..."
@@ -5082,7 +5157,7 @@
if test "$obj" = "$last_oldobj" ; then
RANLIB=$save_RANLIB
fi
- test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds${_S_}
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
objlist=
fi
@@ -5092,13 +5167,12 @@
if test "X$oldobjs" = "X" ; then
eval cmds=\"\$concat_cmds\"
else
- eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ eval cmds=\"\$concat_cmds${_S_}$old_archive_cmds\"
fi
fi
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
- eval cmd=\"$cmd\"
IFS="$save_ifs"
$show "$cmd"
$run eval "$cmd" || exit $?
@@ -5130,11 +5204,9 @@
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $0 $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
- relink_command=
- fi
+
# Only create the output if not a dry run.
if test -z "$run"; then
for installed in no yes; do
@@ -5182,25 +5254,6 @@
newdlprefiles="$newdlprefiles $libdir/$name"
done
dlprefiles="$newdlprefiles"
- else
- newdlfiles=
- for lib in $dlfiles; do
- case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- *) abs=`pwd`"/$lib" ;;
- esac
- newdlfiles="$newdlfiles $abs"
- done
- dlfiles="$newdlfiles"
- newdlprefiles=
- for lib in $dlprefiles; do
- case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
- *) abs=`pwd`"/$lib" ;;
- esac
- newdlprefiles="$newdlprefiles $abs"
- done
- dlprefiles="$newdlprefiles"
fi
$rm $output
# place dlname in correct position for cygwin
@@ -5516,11 +5569,10 @@
# Do each command in the postinstall commands.
lib="$destdir/$realname"
- cmds=$postinstall_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$postinstall_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -5673,7 +5725,7 @@
tmpdir="/tmp"
test -n "$TMPDIR" && tmpdir="$TMPDIR"
tmpdir="$tmpdir/libtool-$$"
- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+ if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
else
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
continue
@@ -5733,17 +5785,16 @@
$show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $?
- if test -n "$stripme" && test -n "$old_striplib"; then
+ if test -n "$stripme" && test -n "$striplib"; then
$show "$old_striplib $oldlib"
$run eval "$old_striplib $oldlib" || exit $?
fi
# Do each command in the postinstall commands.
- cmds=$old_postinstall_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$old_postinstall_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || exit $?
done
@@ -5757,7 +5808,7 @@
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
test -n "$run" && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $0 $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL $0 --finish$current_libdirs'
else
exit 0
fi
@@ -5778,11 +5829,10 @@
for libdir in $libdirs; do
if test -n "$finish_cmds"; then
# Do each command in the finish commands.
- cmds=$finish_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$finish_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd" || admincmds="$admincmds
$cmd"
@@ -6056,11 +6106,10 @@
if test "$mode" = uninstall; then
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- cmds=$postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$postuninstall_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
@@ -6072,11 +6121,10 @@
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- cmds=$old_postuninstall_cmds
- save_ifs="$IFS"; IFS='~'
+ eval cmds=\"$old_postuninstall_cmds\"
+ save_ifs="$IFS"; IFS=$_S_
for cmd in $cmds; do
IFS="$save_ifs"
- eval cmd=\"$cmd\"
$show "$cmd"
$run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then
@@ -6321,8 +6369,6 @@
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
-objectlist FILE Use a list of object files found in FILE to specify objects
- -precious-files-regex REGEX
- don't remove output files matching REGEX
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/missing
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/missing 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/missing 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,7 +1,7 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
-# Franc,ois Pinard <<a href="mailto:pinard at iro.umontreal.ca?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20>, 1996.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <<a href="mailto:pinard at iro.umontreal.ca?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -18,21 +18,39 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
fi
+run=:
+
# In the cases where this matters, `missing' is being run in the
# srcdir already.
-if test -f configure.in; then
+if test -f configure.ac; then
configure_ac=configure.ac
else
configure_ac=configure.in
fi
case "$1" in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case "$1" in
+
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
@@ -43,6 +61,7 @@
Options:
-h, --help display this help and exit
-v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
aclocal touch file \`aclocal.m4'
@@ -51,13 +70,15 @@
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
lex create \`lex.yy.c', if possible, from existing .c
makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]"
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing - GNU libit 0.0"
+ echo "missing 0.4 - GNU automake"
;;
-*)
@@ -67,30 +88,45 @@
;;
aclocal*)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`$configure_ac'. You might want
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`$configure_ac'. You might want to install the
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`$configure_ac'. You might want
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -104,9 +140,14 @@
;;
automake*)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -114,6 +155,34 @@
while read f; do touch "$f"; done
;;
+ autom4te)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
@@ -167,7 +236,37 @@
fi
;;
+ help2man)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
+ echo 1>&2 "\
+WARNING: \`$1' is missing on your system. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit 1
+ fi
+ ;;
+
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -183,6 +282,45 @@
touch $file
;;
+ tar)
+ shift
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ fi
+
+ # We have already tried tar in the generic part.
+ # Look for gnutar/gtar before invocation to avoid ugly error
+ # messages.
+ if (gnutar --version > /dev/null 2>&1); then
+ gnutar "$@" && exit 0
+ fi
+ if (gtar --version > /dev/null 2>&1); then
+ gtar "$@" && exit 0
+ fi
+ firstarg="$1"
+ if shift; then
+ case "$firstarg" in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ case "$firstarg" in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+ fi
+
+ echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+ You may want to install GNU tar or Free paxutils, or check the
+ command line arguments."
+ exit 1
+ ;;
+
*)
echo 1>&2 "\
WARNING: \`$1' is needed, and you do not seem to have it handy on your
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/mkinstalldirs
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/mkinstalldirs 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/mkinstalldirs 2004-05-25 14:19:54 UTC (rev 6754)
@@ -4,12 +4,56 @@
# Created: 1993-05-16
# Public domain
-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
-
errstatus=0
+dirmode=""
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+ case "${1}" in
+ -h | --help | --h* ) # -h for help
+ echo "${usage}" 1>&2; exit 0 ;;
+ -m ) # -m PERM arg
+ shift
+ test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+ dirmode="${1}"
+ shift ;;
+ -- ) shift; break ;; # stop option processing
+ -* ) echo "${usage}" 1>&2; exit 1 ;; # unknown option
+ * ) break ;; # first non-opt arg
+ esac
+done
+
for file
do
+ if test -d "$file"; then
+ shift
+ else
+ break
+ fi
+done
+
+case $# in
+0) exit 0 ;;
+esac
+
+case $dirmode in
+'')
+ if mkdir -p -- . 2>/dev/null; then
+ echo "mkdir -p -- $*"
+ exec mkdir -p -- "$@"
+ fi ;;
+*)
+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+ echo "mkdir -m $dirmode -p -- $*"
+ exec mkdir -m "$dirmode" -p -- "$@"
+ fi ;;
+esac
+
+for file
+do
set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
shift
@@ -22,13 +66,24 @@
esac
if test ! -d "$pathcomp"; then
- echo "mkdir $pathcomp"
+ echo "mkdir $pathcomp"
- mkdir "$pathcomp" || lasterr=$?
+ mkdir "$pathcomp" || lasterr=$?
- if test ! -d "$pathcomp"; then
- errstatus=$lasterr
- fi
+ if test ! -d "$pathcomp"; then
+ errstatus=$lasterr
+ else
+ if test ! -z "$dirmode"; then
+ echo "chmod $dirmode $pathcomp"
+
+ lasterr=""
+ chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+ if test ! -z "$lasterr"; then
+ errstatus=$lasterr
+ fi
+ fi
+ fi
fi
pathcomp="$pathcomp/"
@@ -37,4 +92,8 @@
exit $errstatus
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 3
+# End:
# mkinstalldirs ends here
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.am 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.am 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = libfishsound tests examples
+SUBDIRS = libfishsound examples tests
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -31,13 +33,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ..
ACLOCAL = @ACLOCAL@
@@ -45,12 +43,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -59,27 +61,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -93,41 +97,50 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
-SUBDIRS = libfishsound tests examples
+SUBDIRS = libfishsound examples tests
+subdir = src
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+ uninstall-info-recursive all-recursive install-data-recursive \
+ install-exec-recursive installdirs-recursive install-recursive \
+ uninstall-recursive check-recursive installcheck-recursive
+DIST_COMMON = Makefile.am Makefile.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+mostlyclean-libtool:
+ -rm -f *.lo
+clean-libtool:
+ -rm -rf .libs _libs
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
# To change the values of `make' variables: instead of editing Makefiles,
# (1) if the variable is set in `config.status', edit `config.status'
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
-
- at SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -147,13 +160,18 @@
mostlyclean-recursive clean-recursive distclean-recursive \
maintainer-clean-recursive:
- @set fnord $(MAKEFLAGS); amf=$$2; \
+ @set fnord $$MAKEFLAGS; amf=$$2; \
dot_seen=no; \
- rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
- rev="$$subdir $$rev"; \
- test "$$subdir" != "." || dot_seen=yes; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
done; \
- test "$$dot_seen" = "no" && rev=". $$rev"; \
+ rev="$$rev ."; \
target=`echo $@ | sed s/-recursive//`; \
for subdir in $$rev; do \
echo "Making $$target in $$subdir"; \
@@ -170,135 +188,169 @@
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
- fi; \
+ fi; \
done; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-mostlyclean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-clean-tags:
-
distclean-tags:
- -rm -f TAGS ID
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-maintainer-clean-tags:
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src
-
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
- for subdir in $(SUBDIRS); do \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d $(distdir)/$$subdir \
|| mkdir $(distdir)/$$subdir \
|| exit 1; \
- chmod 777 $(distdir)/$$subdir; \
- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" \
+ distdir=../$(distdir)/$$subdir \
+ distdir) \
|| exit 1; \
fi; \
done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
check-am: all-am
check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+
+install: install-recursive
install-exec: install-exec-recursive
-
-install-data-am:
install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
+
+installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-tags mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic clean-libtool mostlyclean-am
-clean-am: clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
-clean: clean-recursive
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
-distclean-am: distclean-tags distclean-generic clean-am
- -rm -f libtool
+dvi: dvi-recursive
-distclean: distclean-recursive
+dvi-am:
-maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-recursive
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-recursive
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-recursive
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-libtool clean-recursive distclean \
+ distclean-generic distclean-libtool distclean-recursive \
+ distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-man install-recursive \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am installdirs-recursive maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-recursive
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.am 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.am 2004-05-25 14:19:54 UTC (rev 6754)
@@ -9,23 +9,27 @@
FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la $(VORBIS_LIBS) $(SPEEX_LIBS)
if HAVE_OGGZ
-oggz_examples = identify
+oggz_examples = fishsound-identify fishsound-info
if HAVE_LIBSNDFILE1
-oggz_sndfile_examples = decode encode
+oggz_sndfile_examples = fishsound-decode fishsound-encode
endif
endif
# Programs to build
noinst_PROGRAMS = $(oggz_examples) $(oggz_sndfile_examples)
+#bin_PROGRAMS = $(oggz_examples) $(oggz_sndfile_examples)
-identify_SOURCES = identify.c
-identify_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+fishsound_identify_SOURCES = fishsound-identify.c
+fishsound_identify_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS)
-decode_SOURCES = decode.c
-decode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+fishsound_info_SOURCES = fishsound-info.c
+fishsound_info_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS)
-encode_SOURCES = encode.c
-encode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+fishsound_decode_SOURCES = fishsound-decode.c
+fishsound_decode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+fishsound_encode_SOURCES = fishsound-encode.c
+fishsound_encode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -31,13 +33,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ../..
ACLOCAL = @ACLOCAL@
@@ -45,12 +43,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -59,27 +61,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -93,125 +97,157 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
AM_CFLAGS = -Wall -pedantic -g
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/libfishsound $(OGGZ_CFLAGS)
+INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/src/libfishsound \
+ $(OGGZ_CFLAGS)
FISHSOUNDDIR = ../libfishsound
FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la $(VORBIS_LIBS) $(SPEEX_LIBS)
- at HAVE_OGGZ_TRUE@oggz_examples = identify
+ at HAVE_OGGZ_TRUE@oggz_examples = fishsound-identify fishsound-info
- at HAVE_OGGZ_TRUE@@HAVE_LIBSNDFILE1_TRUE at oggz_sndfile_examples = decode encode
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_TRUE at oggz_sndfile_examples = fishsound-decode fishsound-encode
# Programs to build
noinst_PROGRAMS = $(oggz_examples) $(oggz_sndfile_examples)
-identify_SOURCES = identify.c
-identify_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+#bin_PROGRAMS = $(oggz_examples) $(oggz_sndfile_examples)
+fishsound_identify_SOURCES = fishsound-identify.c
+fishsound_identify_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS)
-decode_SOURCES = decode.c
-decode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+fishsound_info_SOURCES = fishsound-info.c
+fishsound_info_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS)
-encode_SOURCES = encode.c
-encode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+fishsound_decode_SOURCES = fishsound-decode.c
+fishsound_decode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+
+fishsound_encode_SOURCES = fishsound-encode.c
+fishsound_encode_LDADD = $(FISHSOUND_LIBS) $(OGGZ_LIBS) $(SNDFILE_LIBS)
+subdir = src/examples
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES =
- at HAVE_OGGZ_TRUE@@HAVE_LIBSNDFILE1_FALSE at noinst_PROGRAMS = \
- at HAVE_OGGZ_TRUE@@HAVE_LIBSNDFILE1_FALSE at identify$(EXEEXT)
- at HAVE_OGGZ_FALSE@@HAVE_LIBSNDFILE1_FALSE at noinst_PROGRAMS =
- at HAVE_OGGZ_TRUE@@HAVE_LIBSNDFILE1_TRUE at noinst_PROGRAMS = \
- at HAVE_OGGZ_TRUE@@HAVE_LIBSNDFILE1_TRUE at identify$(EXEEXT) \
- at HAVE_OGGZ_TRUE@@HAVE_LIBSNDFILE1_TRUE at decode$(EXEEXT) encode$(EXEEXT)
- at HAVE_OGGZ_FALSE@@HAVE_LIBSNDFILE1_TRUE at noinst_PROGRAMS =
-PROGRAMS = $(noinst_PROGRAMS)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+ at HAVE_LIBSNDFILE1_FALSE@@HAVE_OGGZ_TRUE at noinst_PROGRAMS = \
+ at HAVE_LIBSNDFILE1_FALSE@@HAVE_OGGZ_TRUE@ fishsound-identify$(EXEEXT) \
+ at HAVE_LIBSNDFILE1_FALSE@@HAVE_OGGZ_TRUE@ fishsound-info$(EXEEXT)
+ at HAVE_LIBSNDFILE1_FALSE@@HAVE_OGGZ_FALSE at noinst_PROGRAMS =
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_TRUE at noinst_PROGRAMS = \
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_TRUE@ fishsound-identify$(EXEEXT) \
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_TRUE@ fishsound-info$(EXEEXT) \
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_TRUE@ fishsound-decode$(EXEEXT) \
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_TRUE@ fishsound-encode$(EXEEXT)
+ at HAVE_LIBSNDFILE1_TRUE@@HAVE_OGGZ_FALSE at noinst_PROGRAMS =
+PROGRAMS = $(noinst_PROGRAMS)
+am_fishsound_decode_OBJECTS = fishsound-decode.$(OBJEXT)
+fishsound_decode_OBJECTS = $(am_fishsound_decode_OBJECTS)
+fishsound_decode_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+fishsound_decode_LDFLAGS =
+am_fishsound_encode_OBJECTS = fishsound-encode.$(OBJEXT)
+fishsound_encode_OBJECTS = $(am_fishsound_encode_OBJECTS)
+fishsound_encode_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+fishsound_encode_LDFLAGS =
+am_fishsound_identify_OBJECTS = fishsound-identify.$(OBJEXT)
+fishsound_identify_OBJECTS = $(am_fishsound_identify_OBJECTS)
+fishsound_identify_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+fishsound_identify_LDFLAGS =
+am_fishsound_info_OBJECTS = fishsound-info.$(OBJEXT)
+fishsound_info_OBJECTS = $(am_fishsound_info_OBJECTS)
+fishsound_info_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+fishsound_info_LDFLAGS =
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+DEFS = @DEFS@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-identify_OBJECTS = identify.$(OBJEXT)
-identify_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
-identify_LDFLAGS =
-decode_OBJECTS = decode.$(OBJEXT)
-decode_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
-decode_LDFLAGS =
-encode_OBJECTS = encode.$(OBJEXT)
-encode_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
-encode_LDFLAGS =
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/fishsound-decode.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/fishsound-encode.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/fishsound-identify.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/fishsound-info.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON = Makefile.am Makefile.in
+DIST_SOURCES = $(fishsound_decode_SOURCES) $(fishsound_encode_SOURCES) \
+ $(fishsound_identify_SOURCES) $(fishsound_info_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(fishsound_decode_SOURCES) $(fishsound_encode_SOURCES) $(fishsound_identify_SOURCES) $(fishsound_info_SOURCES)
+all: all-am
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(identify_SOURCES) $(decode_SOURCES) $(encode_SOURCES)
-OBJECTS = $(identify_OBJECTS) $(decode_OBJECTS) $(encode_OBJECTS)
-
-all: all-redirect
.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/examples/Makefile
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/examples/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+fishsound-decode$(EXEEXT): $(fishsound_decode_OBJECTS) $(fishsound_decode_DEPENDENCIES)
+ @rm -f fishsound-decode$(EXEEXT)
+ $(LINK) $(fishsound_decode_LDFLAGS) $(fishsound_decode_OBJECTS) $(fishsound_decode_LDADD) $(LIBS)
+fishsound-encode$(EXEEXT): $(fishsound_encode_OBJECTS) $(fishsound_encode_DEPENDENCIES)
+ @rm -f fishsound-encode$(EXEEXT)
+ $(LINK) $(fishsound_encode_LDFLAGS) $(fishsound_encode_OBJECTS) $(fishsound_encode_LDADD) $(LIBS)
+fishsound-identify$(EXEEXT): $(fishsound_identify_OBJECTS) $(fishsound_identify_DEPENDENCIES)
+ @rm -f fishsound-identify$(EXEEXT)
+ $(LINK) $(fishsound_identify_LDFLAGS) $(fishsound_identify_OBJECTS) $(fishsound_identify_LDADD) $(LIBS)
+fishsound-info$(EXEEXT): $(fishsound_info_OBJECTS) $(fishsound_info_DEPENDENCIES)
+ @rm -f fishsound-info$(EXEEXT)
+ $(LINK) $(fishsound_info_LDFLAGS) $(fishsound_info_OBJECTS) $(fishsound_info_LDADD) $(LIBS)
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT) core *.core
-mostlyclean-noinstPROGRAMS:
+distclean-compile:
+ -rm -f *.tab.c
-clean-noinstPROGRAMS:
- -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fishsound-decode.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fishsound-encode.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fishsound-identify.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fishsound-info.Po at am__quote@
-distclean-noinstPROGRAMS:
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
-maintainer-clean-noinstPROGRAMS:
-
.c.o:
- $(COMPILE) -c $<
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
.c.obj:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
-
-mostlyclean-compile:
- -rm -f *.o core *.core
- -rm -f *.$(OBJEXT)
-
-clean-compile:
-
-distclean-compile:
- -rm -f *.tab.c
-
-maintainer-clean-compile:
-
.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CCDEPMODE = @CCDEPMODE@
-.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
mostlyclean-libtool:
-rm -f *.lo
@@ -219,149 +255,150 @@
-rm -rf .libs _libs
distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
-maintainer-clean-libtool:
+ETAGS = etags
+ETAGSFLAGS =
-identify$(EXEEXT): $(identify_OBJECTS) $(identify_DEPENDENCIES)
- @rm -f identify$(EXEEXT)
- $(LINK) $(identify_LDFLAGS) $(identify_OBJECTS) $(identify_LDADD) $(LIBS)
-
-decode$(EXEEXT): $(decode_OBJECTS) $(decode_DEPENDENCIES)
- @rm -f decode$(EXEEXT)
- $(LINK) $(decode_LDFLAGS) $(decode_OBJECTS) $(decode_LDADD) $(LIBS)
-
-encode$(EXEEXT): $(encode_OBJECTS) $(encode_DEPENDENCIES)
- @rm -f encode$(EXEEXT)
- $(LINK) $(encode_LDFLAGS) $(encode_OBJECTS) $(encode_LDADD) $(LIBS)
-
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-mostlyclean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-clean-tags:
-
distclean-tags:
- -rm -f TAGS ID
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-maintainer-clean-tags:
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/examples
-
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
-decode.o: decode.c ../../config.h ../../include/fishsound/fishsound.h \
- ../../include/fishsound/constants.h
-encode.o: encode.c ../../config.h ../../src/libfishsound/fs_compat.h \
- ../../include/fishsound/fishsound.h \
- ../../include/fishsound/constants.h
-identify.o: identify.c ../../config.h \
- ../../include/fishsound/fishsound.h \
- ../../include/fishsound/constants.h
-
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(PROGRAMS)
+
+installdirs:
+
+install: install-am
install-exec: install-exec-am
-
-install-data-am:
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
-all-redirect: all-am
+
+installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags \
- mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+ mostlyclean-am
-clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
- clean-generic mostlyclean-am
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-tags
-distclean-am: distclean-noinstPROGRAMS distclean-compile \
- distclean-libtool distclean-tags distclean-generic \
- clean-am
- -rm -f libtool
+dvi: dvi-am
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-noinstPROGRAMS \
- maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-am
-.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+uninstall-am: uninstall-info-am
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS distclean distclean-compile \
+ distclean-depend distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ tags uninstall uninstall-am uninstall-info-am
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-decode.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-decode.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-decode.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,128 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <oggz/oggz.h>
+#include <fishsound/fishsound.h>
+#include <sndfile.h>
+
+static char * infilename, * outfilename;
+static int begun = 0;
+static FishSoundInfo fsinfo;
+static SNDFILE * sndfile;
+
+static int
+open_output (int samplerate, int channels)
+{
+ SF_INFO sfinfo;
+
+ sfinfo.samplerate = samplerate;
+ sfinfo.channels = channels;
+ sfinfo.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16;
+
+ sndfile = sf_open (outfilename, SFM_WRITE, &sfinfo);
+
+ return 0;
+}
+
+static int
+decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+{
+ if (!begun) {
+ fish_sound_command (fsound, FISH_SOUND_GET_INFO, &fsinfo,
+ sizeof (FishSoundInfo));
+ open_output (fsinfo.samplerate, fsinfo.channels);
+ begun = 1;
+ }
+
+ sf_writef_float (sndfile, (float *)pcm, frames);
+
+ return 0;
+}
+
+static int
+read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
+{
+ FishSound * fsound = (FishSound *)user_data;
+
+ fish_sound_prepare_truncation (fsound, op->granulepos, op->e_o_s);
+ fish_sound_decode (fsound, op->packet, op->bytes);
+
+ return 0;
+}
+
+int
+main (int argc, char ** argv)
+{
+ OGGZ * oggz;
+ FishSound * fsound;
+ long n;
+
+ if (argc < 3) {
+ printf ("usage: %s infilename outfilename\n", argv[0]);
+ printf ("*** FishSound example program. ***\n");
+ printf ("Decodes an Ogg Speex or Ogg Vorbis file producing a PCM wav file.\n");
+ exit (1);
+ }
+
+ infilename = argv[1];
+ outfilename = argv[2];
+
+ fsound = fish_sound_new (FISH_SOUND_DECODE, &fsinfo);
+
+ fish_sound_set_interleave (fsound, 1);
+
+ fish_sound_set_decoded_callback (fsound, decoded, NULL);
+
+ if ((oggz = oggz_open ((char *) infilename, OGGZ_READ)) == NULL) {
+ printf ("unable to open file %s\n", infilename);
+ exit (1);
+ }
+
+ oggz_set_read_callback (oggz, -1, read_packet, fsound);
+
+ while ((n = oggz_read (oggz, 1024)) > 0);
+
+ oggz_close (oggz);
+
+ fish_sound_delete (fsound);
+
+ sf_close (sndfile);
+
+ exit (0);
+}
+
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-encode.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-encode.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-encode.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,137 @@
+/**
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+#include "fs_compat.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+
+#include <oggz/oggz.h>
+#include <fishsound/fishsound.h>
+#include <sndfile.h>
+
+long serialno;
+int b_o_s = 1;
+
+static int
+encoded (FishSound * fsound, unsigned char * buf, long bytes, void * user_data)
+{
+ OGGZ * oggz = (OGGZ *)user_data;
+ ogg_packet op;
+ int err;
+
+ op.packet = buf;
+ op.bytes = bytes;
+ op.b_o_s = b_o_s;
+ op.e_o_s = 0;
+ op.granulepos = 0; /* frameno */
+ op.packetno = -1;
+
+ err = oggz_write_feed (oggz, &op, serialno, 0, NULL);
+ if (err) printf ("err: %d\n", err);
+
+ b_o_s = 0;
+
+ return 0;
+}
+
+int
+main (int argc, char ** argv)
+{
+ OGGZ * oggz;
+ FishSound * fsound;
+ FishSoundInfo fsinfo;
+ SNDFILE * sndfile;
+ SF_INFO sfinfo;
+
+ char * infilename, * outfilename;
+ char * ext = NULL;
+ int format = FISH_SOUND_VORBIS;
+
+ float pcm[2048];
+ long n;
+
+ if (argc < 3) {
+ printf ("usage: %s infile outfile\n", argv[0]);
+ printf ("*** FishSound example program. ***\n");
+ printf ("Opens a pcm audio file and encodes it to an Ogg Vorbis or Speex file.\n");
+ exit (1);
+ }
+
+ infilename = argv[1];
+ outfilename = argv[2];
+
+ sndfile = sf_open (infilename, SFM_READ, &sfinfo);
+
+ if ((oggz = oggz_open (outfilename, OGGZ_WRITE)) == NULL) {
+ printf ("unable to open file %s\n", outfilename);
+ exit (1);
+ }
+
+ serialno = oggz_serialno_new (oggz);
+
+ /* If the given output filename ends in ".spx", encode as Speex,
+ * otherwise use Vorbis */
+ ext = strrchr (outfilename, '.');
+ if (ext && !strncasecmp (ext, ".spx", 4))
+ format = FISH_SOUND_SPEEX;
+ else
+ format = FISH_SOUND_VORBIS;
+
+ fsinfo.channels = sfinfo.channels;
+ fsinfo.samplerate = sfinfo.samplerate;
+ fsinfo.format = format;
+
+ fsound = fish_sound_new (FISH_SOUND_ENCODE, &fsinfo);
+ fish_sound_set_encoded_callback (fsound, encoded, oggz);
+
+ fish_sound_set_interleave (fsound, 1);
+
+ while (sf_readf_float (sndfile, pcm, 1024) > 0) {
+ fish_sound_encode (fsound, (float **)pcm, 1024);
+ while ((n = oggz_write (oggz, 1024)) > 0);
+ }
+
+ fish_sound_flush (fsound);
+ while ((n = oggz_write (oggz, 1024)) > 0);
+
+ oggz_close (oggz);
+
+ fish_sound_delete (fsound);
+
+ sf_close (sndfile);
+
+ exit (0);
+}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-identify.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-identify.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-identify.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,107 @@
+/**
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <oggz/oggz.h>
+#include <fishsound/fishsound.h>
+
+#define DEBUG
+
+static char * infilename;
+
+static int
+dump_identity (unsigned char * buf, long bytes)
+{
+ int format;
+
+ format = fish_sound_identify (buf, bytes);
+ switch (format) {
+ case FISH_SOUND_VORBIS: printf ("Vorbis\n"); break;
+ case FISH_SOUND_SPEEX: printf ("Speex\n"); break;
+ default: printf ("Unknown\n");
+ }
+
+ return 0;
+}
+
+static int
+read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
+{
+
+ if (op->bytes < 8) {
+ printf ("too short\n");
+ } else {
+ printf ("Weak identity:\t");
+ dump_identity (op->packet, 8);
+
+ printf ("Strong identity:\t");
+ dump_identity (op->packet, op->bytes);
+ }
+
+ oggz_set_read_callback (oggz, -1, NULL, NULL);
+
+ return 1;
+}
+
+int
+main (int argc, char ** argv)
+{
+ OGGZ * oggz;
+ long n;
+
+ if (argc < 2) {
+ printf ("usage: %s filename\n", argv[0]);
+ printf ("Checks whether a file is a speex or a vorbis file.\n");
+ exit (1);
+ }
+
+ infilename = argv[1];
+
+ if ((oggz = oggz_open ((char *) infilename, OGGZ_READ)) == NULL) {
+ printf ("unable to open file %s\n", infilename);
+ exit (1);
+ }
+
+ oggz_set_read_callback (oggz, -1, read_packet, NULL);
+
+ while ((n = oggz_read (oggz, 1024)) > 0);
+
+ oggz_close (oggz);
+
+ exit (0);
+}
+
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-info.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-info.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/examples/fishsound-info.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,121 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <oggz/oggz.h>
+#include <fishsound/fishsound.h>
+
+static char * infilename;
+static int begun = 0;
+static FishSoundInfo fsinfo;
+
+static void
+read_comments (FishSound * fsound)
+{
+ const FishSoundComment * comment;
+ const char * vendor;
+
+ vendor = fish_sound_comment_get_vendor (fsound);
+ if (vendor) puts (vendor);
+
+ for (comment = fish_sound_comment_first (fsound); comment;
+ comment = fish_sound_comment_next (fsound, comment)) {
+ if (comment->value) {
+ printf ("%s: %s\r\n", comment->name, comment->value);
+ } else {
+ printf ("%s\r\n", comment->name);
+ }
+ }
+}
+
+static int
+decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+{
+ if (!begun) {
+ read_comments (fsound);
+ begun = 1;
+ }
+
+ return 0;
+}
+
+static int
+read_packet (OGGZ * oggz, ogg_packet * op, long serialno, void * user_data)
+{
+ FishSound * fsound = (FishSound *)user_data;
+
+ fish_sound_decode (fsound, op->packet, op->bytes);
+
+ return 0;
+}
+
+int
+main (int argc, char ** argv)
+{
+ OGGZ * oggz;
+ FishSound * fsound;
+ long n;
+
+ if (argc < 2) {
+ printf ("usage: %s infilename\n", argv[0]);
+ printf ("*** FishSound example program. ***\n");
+ printf ("Read comments from an Ogg Speex or Ogg Vorbis file.\n");
+ exit (1);
+ }
+
+ infilename = argv[1];
+
+ fsound = fish_sound_new (FISH_SOUND_DECODE, &fsinfo);
+ fish_sound_set_interleave (fsound, 1);
+ fish_sound_set_decoded_callback (fsound, decoded, NULL);
+
+ if ((oggz = oggz_open ((char *) infilename, OGGZ_READ)) == NULL) {
+ printf ("unable to open file %s\n", infilename);
+ exit (1);
+ }
+
+ oggz_set_read_callback (oggz, -1, read_packet, fsound);
+
+ while ((n = oggz_read (oggz, 1024)) > 0);
+
+ oggz_close (oggz);
+
+ fish_sound_delete (fsound);
+
+ exit (0);
+}
+
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.am 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.am 2004-05-25 14:19:54 UTC (rev 6754)
@@ -12,8 +12,10 @@
libfishsound_la_SOURCES = \
fishsound.c \
private.h \
+ comments.c \
speex.c \
vorbis.c \
+ fs_vector.c fs_vector.h \
fs_compat.h
libfishsound_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -31,13 +33,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ../..
ACLOCAL = @ACLOCAL@
@@ -45,12 +43,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -59,27 +61,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -93,6 +97,9 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
AM_CFLAGS = -Wall -pedantic
@@ -103,110 +110,127 @@
# Libraries to build
lib_LTLIBRARIES = libfishsound.la
-libfishsound_la_SOURCES = fishsound.c private.h speex.c vorbis.c fs_compat.h
+libfishsound_la_SOURCES = \
+ fishsound.c \
+ private.h \
+ comments.c \
+ speex.c \
+ vorbis.c \
+ fs_vector.c fs_vector.h \
+ fs_compat.h
libfishsound_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@ @SHLIB_VERSION_ARG@
libfishsound_la_LIBADD = $(VORBIS_LIBS) $(SPEEX_LIBS)
+subdir = src/libfishsound
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = Version_script
-LTLIBRARIES = $(lib_LTLIBRARIES)
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES = Version_script
+LTLIBRARIES = $(lib_LTLIBRARIES)
+libfishsound_la_DEPENDENCIES =
+am_libfishsound_la_OBJECTS = fishsound.lo comments.lo speex.lo vorbis.lo \
+ fs_vector.lo
+libfishsound_la_OBJECTS = $(am_libfishsound_la_OBJECTS)
-DEFS = @DEFS@ -I. -I$(srcdir) -I../..
+DEFS = @DEFS@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
-libfishsound_la_DEPENDENCIES =
-libfishsound_la_OBJECTS = fishsound.lo speex.lo vorbis.lo
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/comments.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/fishsound.Plo ./$(DEPDIR)/fs_vector.Plo \
+ at AMDEP_TRUE@ ./$(DEPDIR)/speex.Plo ./$(DEPDIR)/vorbis.Plo
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON = Makefile.am Makefile.in Version_script.in
+DIST_SOURCES = $(libfishsound_la_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in Version_script.in
+SOURCES = $(libfishsound_la_SOURCES)
+all: all-am
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(libfishsound_la_SOURCES)
-OBJECTS = $(libfishsound_la_OBJECTS)
-
-all: all-redirect
.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/libfishsound/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/libfishsound/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
Version_script: $(top_builddir)/config.status Version_script.in
- cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+libLTLIBRARIES_INSTALL = $(INSTALL)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libdir)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
if test -f $$p; then \
- echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
- $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
else :; fi; \
done
uninstall-libLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
+ $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
done
-.c.o:
- $(COMPILE) -c $<
+clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test -z "$dir" && dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
+libfishsound.la: $(libfishsound_la_OBJECTS) $(libfishsound_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libfishsound_la_LDFLAGS) $(libfishsound_la_OBJECTS) $(libfishsound_la_LIBADD) $(LIBS)
-# FIXME: We should only use cygpath when building on Windows,
-# and only if it is available.
-.c.obj:
- $(COMPILE) -c `cygpath -w $<`
-
-.s.o:
- $(COMPILE) -c $<
-
-.S.o:
- $(COMPILE) -c $<
-
mostlyclean-compile:
- -rm -f *.o core *.core
- -rm -f *.$(OBJEXT)
+ -rm -f *.$(OBJEXT) core *.core
-clean-compile:
-
distclean-compile:
-rm -f *.tab.c
-maintainer-clean-compile:
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/comments.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fishsound.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fs_vector.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/speex.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/vorbis.Plo at am__quote@
-.c.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
-.s.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.c.o:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-.S.lo:
- $(LIBTOOL) --mode=compile $(COMPILE) -c $<
+.c.obj:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
+.c.lo:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CCDEPMODE = @CCDEPMODE@
+
mostlyclean-libtool:
-rm -f *.lo
@@ -214,140 +238,152 @@
-rm -rf .libs _libs
distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
-maintainer-clean-libtool:
+ETAGS = etags
+ETAGSFLAGS =
-libfishsound.la: $(libfishsound_la_OBJECTS) $(libfishsound_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libfishsound_la_LDFLAGS) $(libfishsound_la_OBJECTS) $(libfishsound_la_LIBADD) $(LIBS)
-
tags: TAGS
-ID: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- here=`pwd` && cd $(srcdir) \
- && mkid -f$$here/ID $$unique $(LISP)
+ mkid -fID $$unique
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS)'; \
- unique=`for i in $$list; do echo $$i; done | \
- awk ' { files[$$0] = 1; } \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
- test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-mostlyclean-tags:
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
-clean-tags:
-
distclean-tags:
- -rm -f TAGS ID
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-maintainer-clean-tags:
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = src/libfishsound
-
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
-fishsound.lo fishsound.o : fishsound.c ../../config.h private.h \
- fs_compat.h ../../include/fishsound/constants.h
-speex.lo speex.o : speex.c ../../config.h private.h fs_compat.h \
- ../../include/fishsound/constants.h
-vorbis.lo vorbis.o : vorbis.c ../../config.h private.h fs_compat.h \
- ../../include/fishsound/constants.h
-
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
check-am: all-am
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-libLTLIBRARIES
+all-am: Makefile $(LTLIBRARIES)
+
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(libdir)
+
+install: install-am
install-exec: install-exec-am
-
-install-data-am:
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-libLTLIBRARIES
-uninstall: uninstall-am
-all-am: Makefile $(LTLIBRARIES)
-all-redirect: all-am
+
+installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(libdir)
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
- mostlyclean-libtool mostlyclean-tags \
- mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+ mostlyclean-am
-clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
- clean-generic mostlyclean-am
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-tags
-distclean-am: distclean-libLTLIBRARIES distclean-compile \
- distclean-libtool distclean-tags distclean-generic \
- clean-am
- -rm -f libtool
+dvi: dvi-am
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
- maintainer-clean-compile maintainer-clean-libtool \
- maintainer-clean-tags maintainer-clean-generic \
- distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+info-am:
+
+install-data-am:
+
+install-exec-am: install-libLTLIBRARIES
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-am
-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
-distclean-compile clean-compile maintainer-clean-compile \
-mostlyclean-libtool distclean-libtool clean-libtool \
-maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-am
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
+
+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool distclean distclean-compile \
+ distclean-depend distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool tags uninstall \
+ uninstall-am uninstall-info-am uninstall-libLTLIBRARIES
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Version_script.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Version_script.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/Version_script.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -20,6 +20,19 @@
fish_sound_command;
fish_sound_get_interleave;
fish_sound_set_interleave;
+ fish_sound_get_frameno;
+ fish_sound_set_frameno;
+ fish_sound_prepare_truncation;
+
+ fish_sound_comment_get_vendor;
+ fish_sound_comment_first;
+ fish_sound_comment_first_byname;
+ fish_sound_comment_next;
+ fish_sound_comment_next_byname;
+ fish_sound_comment_add;
+ fish_sound_comment_add_byname;
+ fish_sound_comment_remove;
+ fish_sound_comment_remove_byname;
local:
*;
};
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/comments.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/comments.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/comments.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,564 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "private.h"
+
+/*#define DEBUG*/
+
+static char *
+fs_strdup (const char * s)
+{
+ char * ret;
+ if (!s) return NULL;
+ ret = malloc (strlen(s) + 1);
+ return strcpy (ret, s);
+}
+
+static char *
+fs_strdup_len (const char * s, int len)
+{
+ char * ret;
+ if (!s) return NULL;
+ ret = malloc (len + 1);
+ if (!strncpy (ret, s, len)) {
+ free (ret);
+ return NULL;
+ }
+
+ ret[len] = '\0';
+ return ret;
+}
+
+static char *
+fs_index_len (const char * s, char c, int len)
+{
+ int i;
+
+ for (i = 0; *s && i < len; i++, s++) {
+ if (*s == c) return (char *)s;
+ }
+
+ return NULL;
+}
+
+#if 0
+static void comment_init(char **comments, int* length, char *vendor_string);
+static void comment_add(char **comments, int* length, char *tag, char *val);
+#endif
+
+/*
+ Comments will be stored in the Vorbis style.
+ It is describled in the "Structure" section of
+ http://www.xiph.org/ogg/vorbis/doc/v-comment.html
+
+The comment header is decoded as follows:
+ 1) [vendor_length] = read an unsigned integer of 32 bits
+ 2) [vendor_string] = read a UTF-8 vector as [vendor_length] octets
+ 3) [user_comment_list_length] = read an unsigned integer of 32 bits
+ 4) iterate [user_comment_list_length] times {
+ 5) [length] = read an unsigned integer of 32 bits
+ 6) this iteration's user comment = read a UTF-8 vector as [length] octets
+ }
+ 7) [framing_bit] = read a single bit as boolean
+ 8) if ( [framing_bit] unset or end of packet ) then ERROR
+ 9) done.
+
+ If you have troubles, please write to ymnk at jcraft.com.
+ */
+
+#define readint(buf, base) (((buf[base+3]<<24)&0xff000000)| \
+ ((buf[base+2]<<16)&0xff0000)| \
+ ((buf[base+1]<<8)&0xff00)| \
+ (buf[base]&0xff))
+#define writeint(buf, base, val) do{ buf[base+3]=((val)>>24)&0xff; \
+ buf[base+2]=((val)>>16)&0xff; \
+ buf[base+1]=((val)>>8)&0xff; \
+ buf[base]=(val)&0xff; \
+ }while(0)
+
+#if 0
+static void
+comment_init(char **comments, int* length, char *vendor_string)
+{
+ int vendor_length=strlen(vendor_string);
+ int user_comment_list_length=0;
+ int len=4+vendor_length+4;
+ char *p=(char*)malloc(len);
+ if(p==NULL){
+ }
+ writeint(p, 0, vendor_length);
+ memcpy(p+4, vendor_string, vendor_length);
+ writeint(p, 4+vendor_length, user_comment_list_length);
+ *length=len;
+ *comments=p;
+}
+
+static void
+comment_add(char **comments, int* length, char *tag, char *val)
+{
+ char* p=*comments;
+ int vendor_length=readint(p, 0);
+ int user_comment_list_length=readint(p, 4+vendor_length);
+ int tag_len=(tag?strlen(tag):0);
+ int val_len=strlen(val);
+ int len=(*length)+4+tag_len+val_len;
+
+ p=(char*)realloc(p, len);
+ if(p==NULL){
+ }
+
+ writeint(p, *length, tag_len+val_len); /* length of comment */
+ if(tag) memcpy(p+*length+4, tag, tag_len); /* comment */
+ memcpy(p+*length+4+tag_len, val, val_len); /* comment */
+ writeint(p, 4+vendor_length, user_comment_list_length+1);
+
+ *comments=p;
+ *length=len;
+}
+#endif
+
+static int
+fs_comment_validate_byname (const char * name, const char * value)
+{
+ const char * c;
+
+ if (!name || !value) return 0;
+
+ for (c = name; *c; c++) {
+ if (*c < 0x20 || *c > 0x7D || *c == 0x3D) {
+ printf ("XXX char %c in %s invalid\n", *c, name);
+ return 0;
+ }
+ }
+
+ /* XXX: we really should validate value as UTF-8 here, but ... */
+
+ return 1;
+}
+
+static FishSoundComment *
+fs_comment_new (const char * name, const char * value)
+{
+ FishSoundComment * comment;
+
+ if (!fs_comment_validate_byname (name, value)) return NULL;
+
+ comment = malloc (sizeof (FishSoundComment));
+ comment->name = fs_strdup (name);
+ comment->value = fs_strdup (value);
+
+ return comment;
+}
+
+static void
+fs_comment_free (FishSoundComment * comment)
+{
+ if (!comment) return;
+ free (comment->name);
+ free (comment->value);
+ free (comment);
+}
+
+static int
+fs_comment_cmp (const FishSoundComment * comment1, const FishSoundComment * comment2)
+{
+ if (comment1 == comment2) return 1;
+ if (!comment1 || !comment2) return 0;
+
+ if (strcasecmp (comment1->name, comment2->name)) return 0;
+ if (strcmp (comment1->value, comment2->value)) return 0;
+
+ return 1;
+}
+
+/* Public API */
+
+const char *
+fish_sound_comment_get_vendor (FishSound * fsound)
+{
+ if (fsound == NULL) return NULL;
+
+ return fsound->vendor;
+}
+
+int
+fish_sound_comment_set_vendor (FishSound * fsound, const char * vendor_string)
+{
+ if (fsound == NULL) return FISH_SOUND_ERR_BAD;
+
+ if (fsound->vendor) free (fsound->vendor);
+
+ fsound->vendor = fs_strdup (vendor_string);
+
+ return 0;
+}
+
+const FishSoundComment *
+fish_sound_comment_first (FishSound * fsound)
+{
+ if (fsound == NULL) return NULL;
+
+ return fs_vector_nth (fsound->comments, 0);
+}
+
+const FishSoundComment *
+fish_sound_comment_first_byname (FishSound * fsound, char * name)
+{
+ FishSoundComment * comment;
+ int i;
+
+ if (fsound == NULL) return NULL;
+
+ if (name == NULL) return fs_vector_nth (fsound->comments, 0);
+
+ if (!fs_comment_validate_byname (name, ""))
+ return NULL;
+
+ for (i = 0; i < fs_vector_size (fsound->comments); i++) {
+ comment = (FishSoundComment *) fs_vector_nth (fsound->comments, i);
+ if (comment->name && !strcasecmp (name, comment->name))
+ return comment;
+ }
+
+ return NULL;
+}
+
+const FishSoundComment *
+fish_sound_comment_next (FishSound * fsound, const FishSoundComment * comment)
+{
+ int i;
+
+ if (fsound == NULL || comment == NULL) return NULL;
+
+ i = fs_vector_find_index (fsound->comments, comment);
+
+ return fs_vector_nth (fsound->comments, i+1);
+}
+
+const FishSoundComment *
+fish_sound_comment_next_byname (FishSound * fsound,
+ const FishSoundComment * comment)
+{
+ FishSoundComment * v_comment;
+ int i;
+
+ if (fsound == NULL || comment == NULL) return NULL;
+
+ i = fs_vector_find_index (fsound->comments, comment);
+
+ for (i++; i < fs_vector_size (fsound->comments); i++) {
+ v_comment = (FishSoundComment *) fs_vector_nth (fsound->comments, i);
+ if (v_comment->name && !strcasecmp (comment->name, v_comment->name))
+ return v_comment;
+ }
+
+ return NULL;
+}
+
+#define _fs_comment_add(f,c) fs_vector_insert ((f)->comments, (c))
+
+int
+fish_sound_comment_add (FishSound * fsound, FishSoundComment * comment)
+{
+ FishSoundComment * new_comment;
+
+ if (fsound == NULL) return FISH_SOUND_ERR_BAD;
+
+ if (fsound->mode != FISH_SOUND_ENCODE)
+ return FISH_SOUND_ERR_INVALID;
+
+#if FS_ENCODE
+ if (!fs_comment_validate_byname (comment->name, comment->value))
+ return FISH_SOUND_ERR_COMMENT_INVALID;
+
+ new_comment = fs_comment_new (comment->name, comment->value);
+
+ _fs_comment_add (fsound, new_comment);
+
+ return 0;
+#else
+ return FISH_SOUND_ERR_DISABLED;
+#endif
+}
+
+int
+fish_sound_comment_add_byname (FishSound * fsound, const char * name,
+ const char * value)
+{
+ FishSoundComment * comment;
+
+ if (fsound == NULL) return FISH_SOUND_ERR_BAD;
+
+ if (fsound->mode != FISH_SOUND_ENCODE)
+ return FISH_SOUND_ERR_INVALID;
+
+#if FS_ENCODE
+ if (!fs_comment_validate_byname (name, value))
+ return FISH_SOUND_ERR_COMMENT_INVALID;
+
+ comment = fs_comment_new (name, value);
+
+ _fs_comment_add (fsound, comment);
+
+ return 0;
+
+#else
+ return FISH_SOUND_ERR_DISABLED;
+#endif
+}
+
+int
+fish_sound_comment_remove (FishSound * fsound, FishSoundComment * comment)
+{
+ FishSoundComment * v_comment;
+
+ if (fsound == NULL) return FISH_SOUND_ERR_BAD;
+
+ if (fsound->mode != FISH_SOUND_ENCODE)
+ return FISH_SOUND_ERR_INVALID;
+
+#if FS_ENCODE
+
+ v_comment = fs_vector_find (fsound->comments, comment);
+
+ if (v_comment == NULL) return 0;
+
+ fs_vector_remove (fsound->comments, v_comment);
+ fs_comment_free (v_comment);
+
+ return 1;
+
+#else
+ return FISH_SOUND_ERR_DISABLED;
+#endif
+}
+
+int
+fish_sound_comment_remove_byname (FishSound * fsound, char * name)
+{
+ FishSoundComment * comment;
+ int i, ret = 0;
+
+ if (fsound == NULL) return FISH_SOUND_ERR_BAD;
+
+ if (fsound->mode != FISH_SOUND_ENCODE)
+ return FISH_SOUND_ERR_INVALID;
+
+#if FS_ENCODE
+ for (i = 0; i < fs_vector_size (fsound->comments); i++) {
+ comment = (FishSoundComment *) fs_vector_nth (fsound->comments, i);
+ if (!strcasecmp (name, comment->name)) {
+ fish_sound_comment_remove (fsound, comment);
+ i--;
+ ret++;
+ }
+ }
+
+ return ret;
+
+#else
+ return FISH_SOUND_ERR_DISABLED;
+#endif
+}
+
+/* Internal API */
+int
+fish_sound_comments_init (FishSound * fsound)
+{
+ fsound->vendor = NULL;
+ fsound->comments = fs_vector_new ((FishSoundCmpFunc) fs_comment_cmp);
+
+ return 0;
+}
+
+int
+fish_sound_comments_decode (FishSound * fsound, unsigned char * comments,
+ long length)
+{
+ char *c= (char *)comments;
+ int len, i, nb_fields, n;
+ char *end;
+ char * name, * value, * nvalue = NULL;
+ FishSoundComment * comment;
+
+ if (length<8)
+ return -1;
+
+ end = c+length;
+ len=readint(c, 0);
+
+ c+=4;
+ if (c+len>end) return -1;
+
+ /* Vendor */
+ nvalue = fs_strdup_len (c, len);
+ fish_sound_comment_set_vendor (fsound, nvalue);
+#ifdef DEBUG
+ fwrite(c, 1, len, stderr); fputc ('\n', stderr);
+#endif
+ c+=len;
+
+ if (c+4>end) return -1;
+
+ nb_fields=readint(c, 0);
+ c+=4;
+ for (i=0;i<nb_fields;i++)
+ {
+ if (c+4>end) return -1;
+
+ len=readint(c, 0);
+
+ c+=4;
+ if (c+len>end) return -1;
+
+ name = c;
+ value = fs_index_len (c, '=', len);
+ if (value) {
+ *value = '\0';
+ value++;
+
+ n = c+len - value;
+ nvalue = fs_strdup_len (value, n);
+#ifdef DEBUG
+ printf ("fish_sound_comments_decode: %s -> %s (length %d)\n",
+ name, nvalue, n);
+#endif
+ comment = fs_comment_new (name, nvalue);
+ _fs_comment_add (fsound, comment);
+ free (nvalue);
+ } else {
+ nvalue = fs_strdup_len (name, len);
+ comment = fs_comment_new (nvalue, NULL);
+ _fs_comment_add (fsound, comment);
+ free (nvalue);
+ }
+
+ c+=len;
+ }
+
+#ifdef DEBUG
+ printf ("fish_sound_comments_decode: done\n");
+#endif
+
+ return 0;
+}
+
+long
+fish_sound_comments_encode (FishSound * fsound, unsigned char * buf,
+ long length)
+{
+ char * c = (char *)buf;
+ const FishSoundComment * comment;
+ int nb_fields = 0, vendor_length, field_length;
+ long actual_length, remaining = length;
+
+ /* Vendor string */
+ vendor_length = strlen (fsound->vendor);
+ actual_length = 4 + vendor_length;
+
+ /* user comment list length */
+ actual_length += 4;
+
+ for (comment = fish_sound_comment_first (fsound); comment;
+ comment = fish_sound_comment_next (fsound, comment)) {
+ actual_length += 4 + strlen (comment->name); /* [size]"name" */
+ if (comment->value)
+ actual_length += 1 + strlen (comment->value); /* "=value" */
+
+#ifdef DEBUG
+ printf ("fish_sound_comments_encode: %s = %s\n",
+ comment->name, comment->value);
+#endif
+
+ nb_fields++;
+ }
+
+ actual_length++; /* framing bit */
+
+ if (buf == NULL) return actual_length;
+
+ remaining -= 4;
+ if (remaining <= 0) return actual_length;
+ writeint (c, 0, vendor_length);
+ c += 4;
+
+ field_length = strlen (fsound->vendor);
+ memcpy (c, fsound->vendor, MIN (field_length, remaining));
+ c += field_length; remaining -= field_length;
+ if (remaining <= 0 ) return actual_length;
+
+ remaining -= 4;
+ if (remaining <= 0) return actual_length;
+ writeint (c, 0, nb_fields);
+ c += 4;
+
+ for (comment = fish_sound_comment_first (fsound); comment;
+ comment = fish_sound_comment_next (fsound, comment)) {
+
+ field_length = strlen (comment->name); /* [size]"name" */
+ if (comment->value)
+ field_length += 1 + strlen (comment->value); /* "=value" */
+
+ remaining -= 4;
+ if (remaining <= 0) return actual_length;
+ writeint (c, 0, field_length);
+ c += 4;
+
+ field_length = strlen (comment->name);
+ memcpy (c, comment->name, MIN (field_length, remaining));
+ c += field_length; remaining -= field_length;
+ if (remaining <= 0) return actual_length;
+
+ if (comment->value) {
+ remaining --;
+ if (remaining <= 0) return actual_length;
+ *c = '=';
+ c++;
+
+ field_length = strlen (comment->value);
+ memcpy (c, comment->value, MIN (field_length, remaining));
+ c += field_length; remaining -= field_length;
+ if (remaining <= 0) return actual_length;
+ }
+ }
+
+ if (remaining <= 0) return actual_length;
+ *c = 0x01;
+
+ return actual_length;
+}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fishsound.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fishsound.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fishsound.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -92,17 +92,24 @@
if (fsinfo->format == FISH_SOUND_SPEEX) return NULL;
}
}
+ } else if (mode != FISH_SOUND_DECODE) {
+ return NULL;
}
fsound = malloc (sizeof (FishSound));
fsound->mode = mode;
fsound->interleave = 0;
+ fsound->frameno = 0;
+ fsound->next_granulepos = -1;
+ fsound->next_eos = 0;
fsound->codec = NULL;
fsound->codec_data = NULL;
fsound->callback = NULL;
fsound->user_data = NULL;
+ fish_sound_comments_init (fsound);
+
if (mode == FISH_SOUND_DECODE) {
fsound->info.samplerate = 0;
fsound->info.channels = 0;
@@ -112,9 +119,10 @@
fsound->info.channels = fsinfo->channels;
fsound->info.format = fsinfo->format;
- fish_sound_set_format (fsound, fsinfo->format);
- } else {
- /* XXX: error */
+ if (fish_sound_set_format (fsound, fsinfo->format) == -1) {
+ free (fsound);
+ return NULL;
+ }
}
return fsound;
@@ -279,3 +287,33 @@
return 0;
}
+
+long
+fish_sound_get_frameno (FishSound * fsound)
+{
+ if (fsound == NULL) return -1L;
+
+ return fsound->frameno;
+}
+
+int
+fish_sound_set_frameno (FishSound * fsound, long frameno)
+{
+ if (fsound == NULL) return -1;
+
+ fsound->frameno = frameno;
+
+ return 0;
+}
+
+int
+fish_sound_prepare_truncation (FishSound * fsound, long next_granulepos,
+ int next_eos)
+{
+ if (fsound == NULL) return -1;
+
+ fsound->next_granulepos = next_granulepos;
+ fsound->next_eos = next_eos;
+
+ return 0;
+}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_compat.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_compat.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_compat.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -37,5 +37,7 @@
#define inline __inline
#define alloca _alloca
#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#define snprintf _snprintf
#endif
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,232 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+typedef int (*FishSoundFunc) (void * data);
+typedef int (*FishSoundCmpFunc) (const void * data1, const void * data2);
+
+typedef struct _FishSoundVector FishSoundVector;
+
+struct _FishSoundVector {
+ int max_elements;
+ int nr_elements;
+ FishSoundCmpFunc cmp;
+ void ** data;
+};
+
+/*
+ * A vector of void *. New elements will be appended at the tail.
+ */
+
+FishSoundVector *
+fs_vector_new (FishSoundCmpFunc cmp)
+{
+ FishSoundVector * vector;
+
+ vector = malloc (sizeof (FishSoundVector));
+
+ vector->max_elements = 0;
+ vector->nr_elements = 0;
+ vector->cmp = cmp;
+ vector->data = NULL;
+
+ return vector;
+}
+
+static void
+fs_vector_clear (FishSoundVector * vector)
+{
+ free (vector->data);
+ vector->data = NULL;
+ vector->nr_elements = 0;
+ vector->max_elements = 0;
+}
+
+void
+fs_vector_delete (FishSoundVector * vector)
+{
+ fs_vector_clear (vector);
+ free (vector);
+}
+
+int
+fs_vector_size (FishSoundVector * vector)
+{
+ if (vector == NULL) return 0;
+
+ return vector->nr_elements;
+}
+
+void *
+fs_vector_nth (FishSoundVector * vector, int n)
+{
+ if (vector == NULL) return NULL;
+
+ if (n >= vector->nr_elements) return NULL;
+
+ return vector->data[n];
+}
+
+int
+fs_vector_find_index (FishSoundVector * vector, const void * data)
+{
+ void * v_data;
+ int i;
+
+ for (i = 0; i < vector->nr_elements; i++) {
+ v_data = vector->data[i];
+ if (vector->cmp (v_data, data))
+ return i;
+ }
+
+ return -1;
+}
+
+void *
+fs_vector_find (FishSoundVector * vector, const void * data)
+{
+ void * v_data;
+ int i;
+
+ for (i = 0; i < vector->nr_elements; i++) {
+ v_data = vector->data[i];
+ if (vector->cmp (v_data, data))
+ return v_data;
+ }
+
+ return NULL;
+}
+
+int
+fs_vector_foreach (FishSoundVector * vector, FishSoundFunc func)
+{
+ int i;
+
+ for (i = 0; i < vector->nr_elements; i++) {
+ func (vector->data[i]);
+ }
+
+ return 0;
+}
+
+static FishSoundVector *
+fs_vector_grow (FishSoundVector * vector)
+{
+ void * new_elements;
+ int new_max_elements;
+
+ vector->nr_elements++;
+
+ if (vector->nr_elements > vector->max_elements) {
+ if (vector->max_elements == 0) {
+ new_max_elements = 1;
+ } else {
+ new_max_elements = vector->max_elements * 2;
+ }
+
+ new_elements =
+ realloc (vector->data, (size_t)new_max_elements * sizeof (void *));
+
+ if (new_elements == NULL) {
+ vector->nr_elements--;
+ return NULL;
+ }
+
+ vector->max_elements = new_max_elements;
+ vector->data = new_elements;
+ }
+
+ return vector;
+}
+
+void *
+fs_vector_insert (FishSoundVector * vector, void * data)
+{
+ if (fs_vector_grow (vector) == NULL)
+ return NULL;
+
+ vector->data[vector->nr_elements-1] = data;
+
+ return data;
+
+}
+
+static void *
+fs_vector_remove_nth (FishSoundVector * vector, int n)
+{
+ int i;
+ void * new_elements;
+ int new_max_elements;
+
+ vector->nr_elements--;
+
+ if (vector->nr_elements == 0) {
+ fs_vector_clear (vector);
+ } else {
+ for (i = n; i < vector->nr_elements; i++) {
+ vector->data[i] = vector->data[i+1];
+ }
+
+ if (vector->nr_elements < vector->max_elements/2) {
+ new_max_elements = vector->max_elements/2;
+
+ new_elements =
+ realloc (vector->data,
+ (size_t)new_max_elements * sizeof (void *));
+
+ if (new_elements == NULL)
+ return NULL;
+
+ vector->max_elements = new_max_elements;
+ vector->data = new_elements;
+ }
+ }
+
+ return vector;
+}
+
+FishSoundVector *
+fs_vector_remove (FishSoundVector * vector, void * data)
+{
+ int i;
+
+ for (i = 0; i < vector->nr_elements; i++) {
+ if (vector->data[i] == data) {
+ return fs_vector_remove_nth (vector, i);
+ }
+ }
+
+ return vector;
+}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/fs_vector.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,80 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef __FS_VECTOR_H__
+#define __FS_VECTOR_H__
+
+typedef void FishSoundVector;
+
+typedef int (*FishSoundFunc) (void * data);
+typedef int (*FishSoundCmpFunc) (void * data1, void * data2);
+
+FishSoundVector *
+fs_vector_new (FishSoundCmpFunc cmp);
+
+void
+fs_vector_delete (FishSoundVector * vector);
+
+void *
+fs_vector_nth (FishSoundVector * vector, int n);
+
+int
+fs_vector_find_index (FishSoundVector * vector, const void * data);
+
+void *
+fs_vector_find (FishSoundVector * vector, const void * data);
+
+int
+fs_vector_foreach (FishSoundVector * vector, FishSoundFunc func);
+
+int
+fs_vector_size (FishSoundVector * vector);
+
+/**
+ * Add an element to a vector.
+ * \param vector An FishSoundVector
+ * \param data The new element to add
+ * \retval data If the element was successfully added
+ * \retval NULL If adding the element failed due to a realloc() error
+ */
+void *
+fs_vector_insert (FishSoundVector * vector, void * data);
+
+/**
+ * Remove a (void *) element of a vector
+ * \retval \a vector on success
+ * \retval NULL on failure (realloc error)
+ */
+FishSoundVector *
+fs_vector_remove (FishSoundVector * vector, void * data);
+
+#endif /* __FS_VECTOR_H__ */
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/private.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/private.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/private.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -36,6 +36,7 @@
#include <stdlib.h>
#include "fs_compat.h"
+#include "fs_vector.h"
#include <fishsound/constants.h>
@@ -47,6 +48,7 @@
typedef struct _FishSoundInfo FishSoundInfo;
typedef struct _FishSoundCodec FishSoundCodec;
typedef struct _FishSoundFormat FishSoundFormat;
+typedef struct _FishSoundComment FishSoundComment;
typedef int (*FSCodecIdentify) (unsigned char * buf, long bytes);
typedef FishSound * (*FSCodecInit) (FishSound * fsound);
@@ -81,6 +83,11 @@
int format;
};
+struct _FishSoundComment {
+ char * name;
+ char * value;
+};
+
struct _FishSound {
/** FISH_SOUND_DECODE or FISH_SOUND_ENCODE */
FishSoundMode mode;
@@ -88,8 +95,29 @@
/** General info related to sound */
FishSoundInfo info;
+ /** Interleave boolean */
int interleave;
+ /**
+ * Current frameno.
+ */
+ long frameno;
+
+ /**
+ * Truncation frameno for the next block of data sent to decode.
+ * In Ogg encapsulation, this is represented by the Ogg packet's
+ * "granulepos" field.
+ */
+ long next_granulepos;
+
+ /**
+ * Flag if the next block of data sent to decode will be the last one
+ * for this stream (eos = End Of Stream).
+ * In Ogg encapsulation, this is represented by the Ogg packet's
+ * "eos" field.
+ */
+ int next_eos;
+
/** The codec class structure */
FishSoundCodec * codec;
@@ -101,6 +129,10 @@
/** user data for encode/decode callback */
void * user_data;
+
+ /** The comments */
+ char * vendor;
+ FishSoundVector * comments;
};
struct _FishSoundFormat {
@@ -115,9 +147,32 @@
typedef int (*FishSoundEncoded) (FishSound * fsound, unsigned char * buf,
long bytes, void * user_data);
+/* data */
extern FishSoundCodec fish_sound_vorbis;
extern FishSoundCodec fish_sound_speex;
+/* comments */
+int fish_sound_comments_init (FishSound * fsound);
+int fish_sound_comments_decode (FishSound * fsound, unsigned char * buf,
+ long bytes);
+long fish_sound_comments_encode (FishSound * fsound, unsigned char * buf,
+ long length);
+
+/**
+ * Set the vendor string.
+ * \param fsound A FishSound* handle (created with FISH_SOUND_ENCODE)
+ * \param vendor The vendor string.
+ * \retval 0 Success
+ * \retval FISH_SOUND_ERR_BAD \a fsound is not a valid FishSound* handle
+ * \retval FISH_SOUND_ERR_INVALID Operation not suitable for this FishSound
+ */
+int
+fish_sound_comment_set_vendor (FishSound * fsound, const char * vendor);
+
+const FishSoundComment * fish_sound_comment_first (FishSound * fsound);
+const FishSoundComment *
+fish_sound_comment_next (FishSound * fsound, const FishSoundComment * comment);
+
/* inline functions */
static inline void
@@ -125,10 +180,12 @@
long frames, int channels, float mult_factor)
{
int i, j;
+ float * d, * s = (float *)src;
for (i = 0; i < frames; i++) {
for (j = 0; j < channels; j++) {
- dest[j][i] = src[i][j] * mult_factor;
+ d = dest[j];
+ d[i] = s[i*channels + j] * mult_factor;
}
}
}
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/speex.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/speex.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/speex.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -49,12 +49,15 @@
#include <speex_stereo.h>
#include <speex_callbacks.h>
+/* Format for the vendor string: "Encoded with Speex VERSION", where VERSION
+ * is the libspeex version as read from a newly-generated Speex header.
+ */
+#define VENDOR_FORMAT "Encoded with Speex %s"
+
#define DEFAULT_ENH_ENABLED 1
#define MAX_FRAME_BYTES 2000
-//Zen's hack
-__int64 frame_count = 0;
typedef struct _FishSoundSpeexEnc {
int frame_offset; /* number of speex frames done in this packet */
int pcm_offset;
@@ -83,7 +86,7 @@
if (bytes < 8) return FISH_SOUND_UNKNOWN;
- if (!strncmp (buf, "Speex ", 8)) {
+ if (!strncmp ((char *)buf, "Speex ", 8)) {
/* if only a short buffer was passed, do a weak identify */
if (bytes == 8) return FISH_SOUND_SPEEX;
@@ -101,13 +104,7 @@
static int
fs_speex_command (FishSound * fsound, int command, void * data, int datasize)
{
- if (command == SPEEX_TELL_GRANULE_POS) {
- __int64* locTemp = (__int64*) data;
- *locTemp = frame_count;
-
- }
- return 0;
-
+ return 0;
}
#ifdef FS_DECODE
@@ -141,7 +138,8 @@
modeID = header->mode;
if (forceMode!=-1)
modeID = forceMode;
- mode = speex_mode_list[modeID];
+ /* speex_mode_list[] is declared const in speex 1.1.x, hence the cast */
+ mode = (SpeexMode *)speex_mode_list[modeID];
if (header->speex_version_id > 1) {
/*
@@ -271,8 +269,11 @@
if (fss->nframes == 0) fss->nframes = 1;
+ } else if (fss->packetno == 1) {
+ /* Comments */
+ fish_sound_comments_decode (fsound, buf, bytes);
} else if (fss->packetno <= 1+fss->extra_headers) {
- /* XXX: metadata etc. */
+ /* Unknown extra headers */
} else {
speex_bits_read_from (&fss->bits, (char *)buf, (int)bytes);
@@ -302,6 +303,8 @@
retpcm = (float **)fss->pcm;
}
+ fsound->frameno += fss->frame_size;
+
/* fss->pcm is ready to go! */
if (fsound->callback) {
((FishSoundDecoded)fsound->callback) (fsound, retpcm,
@@ -329,11 +332,12 @@
FishSoundSpeexInfo * fss = (FishSoundSpeexInfo *)fsound->codec_data;
SpeexMode * mode = NULL;
SpeexHeader header;
- char * buf;
+ unsigned char * buf;
int bytes;
/* XXX: set wb, nb, uwb modes */
- mode = &speex_wb_mode;
+ /* These modes are declared const in speex 1.1.x, hence the explicit cast */
+ mode = (SpeexMode *)&speex_wb_mode;
speex_init_header (&header, fsound->info.samplerate, 1, mode);
header.frames_per_packet = fss->nframes; /* XXX: frames per packet */
@@ -344,15 +348,23 @@
if (fsound->callback) {
FishSoundEncoded encoded = (FishSoundEncoded)fsound->callback;
+ char vendor_string[128];
/* header */
- buf = speex_header_to_packet (&header, &bytes);
- encoded (fsound, (unsigned char *)buf, (long)bytes, fsound->user_data);
+ buf = (unsigned char *) speex_header_to_packet (&header, &bytes);
+ encoded (fsound, buf, (long)bytes, fsound->user_data);
fss->packetno++;
free (buf);
- /* XXX: and comments */
- encoded (fsound, NULL, 0, fsound->user_data);
+ /* comments */
+ snprintf (vendor_string, 128, VENDOR_FORMAT, header.speex_version);
+ fish_sound_comment_set_vendor (fsound, vendor_string);
+ bytes = fish_sound_comments_encode (fsound, NULL, 0);
+ buf = malloc (bytes);
+ bytes = fish_sound_comments_encode (fsound, buf, bytes);
+ encoded (fsound, buf, (long)bytes, fsound->user_data);
+ fss->packetno++;
+ free (buf);
}
speex_encoder_ctl (fss->st, SPEEX_SET_SAMPLING_RATE,
@@ -406,6 +418,7 @@
fse->frame_offset++;
if (fse->frame_offset == fss->nframes) {
+ fsound->frameno += fss->frame_size * fss->nframes;
nencoded = fs_speex_encode_write (fsound);
fse->frame_offset = 0;
}
@@ -418,7 +431,6 @@
static long
fs_speex_encode_i (FishSound * fsound, float ** pcm, long frames)
{
-
FishSoundSpeexInfo * fss = (FishSoundSpeexInfo *)fsound->codec_data;
FishSoundSpeexEnc * fse = (FishSoundSpeexEnc *)fss->enc;
long remaining = frames, len, nencoded = 0;
@@ -426,17 +438,12 @@
int channels = fsound->info.channels;
float * p = (float *)pcm;
-
-
if (fss->packetno == 0)
fs_speex_enc_headers (fsound);
while (remaining > 0) {
len = MIN (remaining, fss->frame_size - fse->pcm_offset);
-
- //Zen's hack
- frame_count+= len;
- //
+
start = fse->pcm_offset * channels;
end = (len + fse->pcm_offset) * channels;
for (j = start; j < end; j++) {
@@ -446,22 +453,7 @@
fse->pcm_offset += len;
if (fse->pcm_offset == fss->frame_size) {
-#if 0
- fse->pcm_offset = 0;
-
- if (fsound->info.channels == 2)
- speex_encode_stereo (fss->ipcm, fss->frame_size, &fss->bits);
-
- speex_encode (fss->st, fss->ipcm, &fss->bits);
-
- fse->frame_offset++;
- if (fse->frame_offset == fss->nframes) {
- nencoded += fs_speex_encode_write (fsound);
- fse->frame_offset = 0;
- }
-#else
nencoded += fs_speex_encode_block (fsound);
-#endif
}
remaining -= len;
@@ -474,7 +466,6 @@
fs_speex_encode_n (FishSound * fsound, float * pcm[], long frames)
{
FishSoundSpeexInfo * fss = (FishSoundSpeexInfo *)fsound->codec_data;
- FishSoundSpeexEnc * fse = (FishSoundSpeexEnc *)fss->enc;
long remaining = frames, len;
int i, j;
@@ -521,23 +512,11 @@
FishSoundSpeexEnc * fse = (FishSoundSpeexEnc *)fss->enc;
long nencoded = 0;
- if (fse->pcm_offset > 0) {
-#if 0
- fse->pcm_offset = 0;
+ if (fsound->mode != FISH_SOUND_ENCODE)
+ return 0;
- if (fsound->info.channels == 2)
- speex_encode_stereo (fss->ipcm, fse->pcm_offset, &fss->bits);
-
- speex_encode (fss->st, fss->ipcm, &fss->bits);
-
- fse->frame_offset++;
- if (fse->frame_offset == fss->nframes) {
- nencoded += fs_speex_encode_write (fsound);
- fse->frame_offset = 0;
- }
-#else
+ if (fse->pcm_offset > 0) {
nencoded += fs_speex_encode_block (fsound);
-#endif
}
if (fse->frame_offset == 0) return 0;
@@ -572,15 +551,11 @@
static FishSound *
fs_speex_enc_init (FishSound * fsound)
{
-
FishSoundSpeexInfo * fss = (FishSoundSpeexInfo *)fsound->codec_data;
FishSoundSpeexEnc * fse;
fse = malloc (sizeof (FishSoundSpeexEnc));
if (fse == NULL) return NULL;
- //Zen's hack
- frame_count = 0;
- //
fse->frame_offset = 0;
fse->pcm_offset = 0;
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/vorbis.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/vorbis.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/libfishsound/vorbis.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -175,13 +175,7 @@
fs_vorbis_command (FishSound * fsound, int command, void * data,
int datasize)
{
-
- if (command == VORBIS_TELL_GRANULE_POS) {
- __int64* locTemp = (__int64*) data;
- *locTemp = ((FishSoundVorbisInfo *)fsound->codec_data)->vd.granulepos;
-
- }
- return 0;
+ return 0;
}
#ifdef FS_DECODE
@@ -194,15 +188,16 @@
long samples;
int ret;
- /* Make a fake ogg_packet structure to pass the data to libvorbis */
+ /* Make an ogg_packet structure to pass the data to libvorbis */
op.packet = buf;
op.bytes = bytes;
op.b_o_s = (fsv->packetno == 0) ? 1 : 0;
- op.e_o_s = 0;
- op.granulepos = 7;
+ op.e_o_s = fsound->next_eos;
+ op.granulepos = fsound->next_granulepos;
op.packetno = fsv->packetno;
if (fsv->packetno < 3) {
+
if ((ret = vorbis_synthesis_headerin (&fsv->vi, &fsv->vc, &op)) == 0) {
if (fsv->vi.rate != 0) {
#ifdef DEBUG
@@ -214,7 +209,12 @@
}
}
- if (fsv->packetno == 2) {
+ /* Decode comments from packet 1. Vorbis has 7 bytes of marker at the
+ * start of vorbiscomment packet. */
+ if (fsv->packetno == 1 && bytes > 7 && buf[0] == 0x03 &&
+ !strncmp ((char *)&buf[1], "vorbis", 6)) {
+ fish_sound_comments_decode (fsound, buf+7, bytes-7);
+ } else if (fsv->packetno == 2) {
vorbis_synthesis_init (&fsv->vd, &fsv->vi);
vorbis_block_init (&fsv->vd, &fsv->vb);
}
@@ -237,14 +237,22 @@
} else {
retpcm = pcm;
}
-
+
if (fsound->callback) {
((FishSoundDecoded)fsound->callback) (fsound, retpcm, samples,
fsound->user_data);
}
+
+ if (fsound->frameno != -1)
+ fsound->frameno += samples;
}
}
+ if (fsound->next_granulepos != -1) {
+ fsound->frameno = fsound->next_granulepos;
+ fsound->next_granulepos = -1;
+ }
+
fsv->packetno++;
return 0;
@@ -262,6 +270,7 @@
fs_vorbis_enc_headers (FishSound * fsound)
{
FishSoundVorbisInfo * fsv = (FishSoundVorbisInfo *)fsound->codec_data;
+ const FishSoundComment * comment;
ogg_packet header;
ogg_packet header_comm;
ogg_packet header_code;
@@ -272,10 +281,22 @@
third header holds the bitstream codebook. We merely need to
make the headers, then pass them to libvorbis one at a time;
libvorbis handles the additional Ogg bitstream constraints */
+
+ /* Update the comments */
+ for (comment = fish_sound_comment_first (fsound); comment;
+ comment = fish_sound_comment_next (fsound, comment)) {
+#ifdef DEBUG
+ fprintf (stderr, "fs_vorbis_enc_headers: %s = %s\n",
+ comment->name, comment->value);
+#endif
+ vorbis_comment_add_tag (&fsv->vc, comment->name, comment->value);
+ }
+ /* Generate the headers */
vorbis_analysis_headerout(&fsv->vd, &fsv->vc,
&header, &header_comm, &header_code);
+ /* Pass the generated headers to the user */
if (fsound->callback) {
FishSoundEncoded encoded = (FishSoundEncoded)fsound->callback;
@@ -305,8 +326,12 @@
while (vorbis_bitrate_flushpacket (&fsv->vd, &op)) {
if (fsound->callback) {
FishSoundEncoded encoded = (FishSoundEncoded)fsound->callback;
-
+
encoded (fsound, op.packet, op.bytes, fsound->user_data);
+
+ if (op.granulepos != -1)
+ fsound->frameno = op.granulepos;
+
fsv->packetno++;
}
}
@@ -321,7 +346,6 @@
FishSoundVorbisInfo * fsv = (FishSoundVorbisInfo *)fsound->codec_data;
float ** vpcm;
long len, remaining = frames;
- int i, j;
float * d = (float *)pcm;
if (fsv->packetno == 0) {
@@ -334,12 +358,7 @@
/* expose the buffer to submit data */
vpcm = vorbis_analysis_buffer (&fsv->vd, 1024);
- /*_fs_deinterleave (p, vpcm, len, fsound->info.channels, 1.0);*/
- for (i = 0; i < fsound->info.channels; i++) {
- for (j = 0; j < len; j++) {
- vpcm[i][j] = d[j*fsound->info.channels + i];
- }
- }
+ _fs_deinterleave ((float **)d, vpcm, len, fsound->info.channels, 1.0);
d += (len * fsound->info.channels);
@@ -348,6 +367,13 @@
remaining -= len;
}
+ /**
+ * End of input. Tell libvorbis we're at the end of stream so that it can
+ * handle the last frame and marke end of stream in the output properly.
+ */
+ if (fsound->next_eos)
+ fs_vorbis_encode_write (fsound, 0);
+
return 0;
}
@@ -387,6 +413,13 @@
remaining -= len;
}
+ /**
+ * End of input. Tell libvorbis we're at the end of stream so that it can
+ * handle the last frame and marke end of stream in the output properly.
+ */
+ if (fsound->next_eos)
+ fs_vorbis_encode_write (fsound, 0);
+
return 0;
}
@@ -419,7 +452,7 @@
vorbis_encode_init_vbr (&fsv->vi, fsound->info.channels,
- fsound->info.samplerate, (float)0.4 /* quality */);
+ fsound->info.samplerate, (float)0.3 /* quality */);
vorbis_encode_setup_init (&fsv->vi);
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.am
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.am 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.am 2004-05-25 14:19:54 UTC (rev 6754)
@@ -4,9 +4,33 @@
INCLUDES = -I$(top_srcdir)/include
+FISHSOUNDDIR = ../libfishsound
+FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la $(VORBIS_LIBS) $(SPEEX_LIBS)
+
# Test programs
-#xTESTS =
+test: check
-#noinst_PROGRAMS = $(xTESTS)
+if FS_ENCODE
+encode_tests = comment-test
+endif
+if FS_DECODE
+if FS_ENCODE
+encdec_tests = encdec-comments encdec-audio
+endif
+endif
+
+TESTS = $(encode_tests) $(decode_tests) $(encdec_tests)
+
+noinst_PROGRAMS = $(TESTS)
+noinst_HEADERS = fs_tests.h
+
+comment_test_SOURCES = comment-test.c
+comment_test_LDADD = $(FISHSOUND_LIBS)
+
+encdec_comments_SOURCES = encdec-comments.c
+encdec_comments_LDADD = $(FISHSOUND_LIBS)
+
+encdec_audio_SOURCES = encdec-audio.c
+encdec_audio_LDADD = $(FISHSOUND_LIBS)
\ No newline at end of file
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.in
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.in 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/Makefile.in 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +12,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-
+ at SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
@@ -31,13 +33,9 @@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
-
-DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ../..
ACLOCAL = @ACLOCAL@
@@ -45,12 +43,16 @@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
-
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
@@ -59,27 +61,29 @@
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
AR = @AR@
AS = @AS@
+AWK = @AWK@
CC = @CC@
CXX = @CXX@
CXXCPP = @CXXCPP@
+DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EGREP = @EGREP@
-EXEEXT = @EXEEXT@
F77 = @F77@
GCJ = @GCJ@
GCJFLAGS = @GCJFLAGS@
HAVE_DOXYGEN = @HAVE_DOXYGEN@
-HAVE_LIB = @HAVE_LIB@
-LIB = @LIB@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
-LTLIB = @LTLIB@
-MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
OGGZ_LIBS = @OGGZ_LIBS@
PACKAGE = @PACKAGE@
PKG_CONFIG = @PKG_CONFIG@
@@ -93,116 +97,353 @@
STRIP = @STRIP@
VERSION = @VERSION@
VORBIS_LIBS = @VORBIS_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
AM_CFLAGS = -Wall -pedantic
INCLUDES = -I$(top_srcdir)/include
+
+FISHSOUNDDIR = ../libfishsound
+FISHSOUND_LIBS = $(FISHSOUNDDIR)/libfishsound.la $(VORBIS_LIBS) $(SPEEX_LIBS)
+
+ at FS_ENCODE_TRUE@encode_tests = comment-test
+
+ at FS_DECODE_TRUE@@FS_ENCODE_TRUE at encdec_tests = encdec-comments encdec-audio
+
+TESTS = $(encode_tests) $(decode_tests) $(encdec_tests)
+
+noinst_PROGRAMS = $(TESTS)
+noinst_HEADERS = fs_tests.h
+
+comment_test_SOURCES = comment-test.c
+comment_test_LDADD = $(FISHSOUND_LIBS)
+
+encdec_comments_SOURCES = encdec-comments.c
+encdec_comments_LDADD = $(FISHSOUND_LIBS)
+
+encdec_audio_SOURCES = encdec-audio.c
+encdec_audio_LDADD = $(FISHSOUND_LIBS)
+subdir = src/tests
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES =
-DIST_COMMON = Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+ at FS_DECODE_FALSE@@FS_ENCODE_TRUE at noinst_PROGRAMS = comment-test$(EXEEXT)
+ at FS_DECODE_FALSE@@FS_ENCODE_FALSE at noinst_PROGRAMS =
+ at FS_DECODE_TRUE@@FS_ENCODE_TRUE at noinst_PROGRAMS = comment-test$(EXEEXT) \
+ at FS_DECODE_TRUE@@FS_ENCODE_TRUE@ encdec-comments$(EXEEXT) \
+ at FS_DECODE_TRUE@@FS_ENCODE_TRUE@ encdec-audio$(EXEEXT)
+ at FS_DECODE_TRUE@@FS_ENCODE_FALSE at noinst_PROGRAMS =
+PROGRAMS = $(noinst_PROGRAMS)
+am_comment_test_OBJECTS = comment-test.$(OBJEXT)
+comment_test_OBJECTS = $(am_comment_test_OBJECTS)
+comment_test_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+comment_test_LDFLAGS =
+am_encdec_audio_OBJECTS = encdec-audio.$(OBJEXT)
+encdec_audio_OBJECTS = $(am_encdec_audio_OBJECTS)
+encdec_audio_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+encdec_audio_LDFLAGS =
+am_encdec_comments_OBJECTS = encdec-comments.$(OBJEXT)
+encdec_comments_OBJECTS = $(am_encdec_comments_OBJECTS)
+encdec_comments_DEPENDENCIES = $(FISHSOUNDDIR)/libfishsound.la
+encdec_comments_LDFLAGS =
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DEFS = @DEFS@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+ at AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/comment-test.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/encdec-audio.Po \
+ at AMDEP_TRUE@ ./$(DEPDIR)/encdec-comments.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
+ $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(comment_test_SOURCES) $(encdec_audio_SOURCES) \
+ $(encdec_comments_SOURCES)
+HEADERS = $(noinst_HEADERS)
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
+DIST_COMMON = $(noinst_HEADERS) Makefile.am Makefile.in
+SOURCES = $(comment_test_SOURCES) $(encdec_audio_SOURCES) $(encdec_comments_SOURCES)
+
+all: all-am
+
.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/tests/Makefile
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --gnu src/tests/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+clean-noinstPROGRAMS:
+ @list='$(noinst_PROGRAMS)'; for p in $$list; do \
+ f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f $$p $$f"; \
+ rm -f $$p $$f ; \
+ done
+comment-test$(EXEEXT): $(comment_test_OBJECTS) $(comment_test_DEPENDENCIES)
+ @rm -f comment-test$(EXEEXT)
+ $(LINK) $(comment_test_LDFLAGS) $(comment_test_OBJECTS) $(comment_test_LDADD) $(LIBS)
+encdec-audio$(EXEEXT): $(encdec_audio_OBJECTS) $(encdec_audio_DEPENDENCIES)
+ @rm -f encdec-audio$(EXEEXT)
+ $(LINK) $(encdec_audio_LDFLAGS) $(encdec_audio_OBJECTS) $(encdec_audio_LDADD) $(LIBS)
+encdec-comments$(EXEEXT): $(encdec_comments_OBJECTS) $(encdec_comments_DEPENDENCIES)
+ @rm -f encdec-comments$(EXEEXT)
+ $(LINK) $(encdec_comments_LDFLAGS) $(encdec_comments_OBJECTS) $(encdec_comments_LDADD) $(LIBS)
+mostlyclean-compile:
+ -rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+ -rm -f *.tab.c
+
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/comment-test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encdec-audio.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/encdec-comments.Po at am__quote@
+
+distclean-depend:
+ -rm -rf ./$(DEPDIR)
+
+.c.o:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+
+.c.obj:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(COMPILE) -c `cygpath -w $<`
+
+.c.lo:
+ at AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+ at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+CCDEPMODE = @CCDEPMODE@
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-TAGS:
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(ETAGS_ARGS)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
-subdir = src/tests
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+
+check-TESTS: $(TESTS)
+ @failed=0; all=0; xfail=0; xpass=0; \
+ srcdir=$(srcdir); export srcdir; \
+ list='$(TESTS)'; \
+ if test -n "$$list"; then \
+ for tst in $$list; do \
+ if test -f ./$$tst; then dir=./; \
+ elif test -f $$tst; then dir=; \
+ else dir="$(srcdir)/"; fi; \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+ xpass=`expr $$xpass + 1`; \
+ failed=`expr $$failed + 1`; \
+ echo "XPASS: $$tst"; \
+ ;; \
+ *) \
+ echo "PASS: $$tst"; \
+ ;; \
+ esac; \
+ elif test $$? -ne 77; then \
+ all=`expr $$all + 1`; \
+ case " $(XFAIL_TESTS) " in \
+ *" $$tst "*) \
+ xfail=`expr $$xfail + 1`; \
+ echo "XFAIL: $$tst"; \
+ ;; \
+ *) \
+ failed=`expr $$failed + 1`; \
+ echo "FAIL: $$tst"; \
+ ;; \
+ esac; \
+ fi; \
+ done; \
+ if test "$$failed" -eq 0; then \
+ if test "$$xfail" -eq 0; then \
+ banner="All $$all tests passed"; \
+ else \
+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+ fi; \
+ else \
+ if test "$$xpass" -eq 0; then \
+ banner="$$failed of $$all tests failed"; \
+ else \
+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+ fi; \
+ fi; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ echo "$$dashes"; \
+ test "$$failed" -eq 0; \
+ else :; fi
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
+ @list='$(DISTFILES)'; for file in $$list; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkinstalldirs) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
+ || cp -p $$d/$$file $(distdir)/$$file \
+ || exit 1; \
fi; \
done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
+all-am: Makefile $(PROGRAMS) $(HEADERS)
+
+installdirs:
+
+install: install-am
install-exec: install-exec-am
-
-install-data-am:
install-data: install-data-am
+uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
+
+installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
-mostlyclean-am: mostlyclean-generic
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
-mostlyclean: mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
+ mostlyclean-am
-clean-am: clean-generic mostlyclean-am
+distclean: distclean-am
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+ distclean-generic distclean-libtool distclean-tags
-distclean-am: distclean-generic clean-am
- -rm -f libtool
+dvi: dvi-am
-distclean: distclean-am
+dvi-am:
-maintainer-clean-am: maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
+info: info-am
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
maintainer-clean: maintainer-clean-am
-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+mostlyclean: mostlyclean-am
-# Test programs
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+ mostlyclean-libtool
-#xTESTS =
+uninstall-am: uninstall-info-am
-#noinst_PROGRAMS = $(xTESTS)
+.PHONY: GTAGS all all-am check check-TESTS check-am clean clean-generic \
+ clean-libtool clean-noinstPROGRAMS distclean distclean-compile \
+ distclean-depend distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am info info-am install \
+ install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ tags uninstall uninstall-am uninstall-info-am
+
+# Test programs
+
+test: check
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/comment-test.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/comment-test.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/comment-test.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,221 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <fishsound/fishsound.h>
+
+#include "fs_tests.h"
+
+#define ARTIST1 "Trout Junkies"
+#define ARTIST2 "DJ Fugu"
+#define COPYRIGHT "Copyright (C) 2004. Some Rights Reserved."
+#define LICENSE "Creative Commons Attribute Share-Alike v1.0"
+#define COMMENT "Unstructured comments are evil."
+
+static FishSound * fsound;
+
+int
+main (int argc, char * argv[])
+{
+ FishSoundInfo fsinfo;
+ const FishSoundComment * comment, * comment2;
+ FishSoundComment mycomment;
+ int err;
+
+ fsinfo.samplerate = 16000;
+ fsinfo.channels = 1;
+ /* The format doesn't really matter as we're not actually
+ * going to encode any audio, so just ensure we can
+ * set this to something that's configured.
+ */
+#if HAVE_VORBIS
+ fsinfo.format = FISH_SOUND_VORBIS;
+#else
+ fsinfo.format = FISH_SOUND_SPEEX;
+#endif
+
+#if FS_ENCODE
+ INFO ("Initializing FishSound for comments (encode)");
+ fsound = fish_sound_new (FISH_SOUND_ENCODE, &fsinfo);
+
+ INFO ("+ Testing add of invalid unstructured COMMENT byname");
+ err = fish_sound_comment_add_byname (fsound, COMMENT, NULL);
+ if (err != FISH_SOUND_ERR_COMMENT_INVALID)
+ FAIL ("Invalid comment not detected");
+
+ INFO ("+ Testing add of invalid unstructured COMMENT from local storage");
+ mycomment.name = COMMENT;
+ mycomment.value = NULL;
+ err = fish_sound_comment_add (fsound, &mycomment);
+ if (err != FISH_SOUND_ERR_COMMENT_INVALID)
+ FAIL ("Invalid comment not detected");
+
+ INFO ("+ Adding ARTIST1 byname");
+ err = fish_sound_comment_add_byname (fsound, "ARTIST", ARTIST1);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Adding COPYRIGHT byname");
+ err = fish_sound_comment_add_byname (fsound, "COPYRIGHT", COPYRIGHT);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Retrieving first (expect ARTIST1)");
+ comment = fish_sound_comment_first (fsound);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted ARTIST1 not retrieved");
+
+ if (strcmp (comment->name, "ARTIST"))
+ FAIL ("Incorrect ARTIST1 name found");
+
+ if (strcmp (comment->value, ARTIST1))
+ FAIL ("Incorrect ARTIST1 value found");
+
+ INFO ("+ Retrieving next (expect COPYRIGHT)");
+ comment = fish_sound_comment_next (fsound, comment);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted COPYRIGHT not retrieved");
+
+ if (strcmp (comment->name, "COPYRIGHT"))
+ FAIL ("Incorrect COPYRIGHT name found");
+
+ if (strcmp (comment->value, COPYRIGHT))
+ FAIL ("Incorrect COPYRIGHT value found");
+
+ INFO ("+ Checking comments termination");
+ comment2 = fish_sound_comment_next (fsound, comment);
+
+ if (comment2 != NULL)
+ FAIL ("Comments unterminated");
+
+ INFO ("+ Adding LICENSE from local storage");
+ mycomment.name = "LICENSE";
+ mycomment.value = LICENSE;
+ err = fish_sound_comment_add (fsound, &mycomment);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Retrieving next (expect LICENSE)");
+ comment = fish_sound_comment_next (fsound, comment);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted LICENSE not retrieved");
+
+ if (comment == &mycomment)
+ FAIL ("Recently inserted LICENSE not restored");
+
+ if (strcmp (comment->name, "LICENSE"))
+ FAIL ("Incorrect LICENSE name found");
+
+ if (strcmp (comment->value, LICENSE))
+ FAIL ("Incorrect LICENSE value found");
+
+ INFO ("+ Adding ARTIST2 byname");
+ err = fish_sound_comment_add_byname (fsound, "ARTIST", ARTIST2);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Retrieving first ARTIST using wierd caps (expect ARTIST1)");
+ comment = fish_sound_comment_first_byname (fsound, "ArTiSt");
+
+ if (comment == NULL)
+ FAIL ("Recently inserted ARTIST1 not retrieved");
+
+ if (strcmp (comment->name, "ARTIST"))
+ FAIL ("Incorrect ARTIST1 name found");
+
+ if (strcmp (comment->value, ARTIST1))
+ FAIL ("Incorrect ARTIST1 value found");
+
+ INFO ("+ Retrieving next ARTIST (expect ARTIST2)");
+ comment = fish_sound_comment_next_byname (fsound, comment);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted ARTIST2 not retrieved");
+
+ if (strcmp (comment->name, "ARTIST"))
+ FAIL ("Incorrect ARTIST2 name found");
+
+ if (strcmp (comment->value, ARTIST2))
+ FAIL ("Incorrect ARTIST2 value found");
+
+ INFO ("+ Removing LICENSE byname");
+ err = fish_sound_comment_remove_byname (fsound, "LICENSE");
+ if (err != 1) FAIL ("Operation failed");
+
+ INFO ("+ Attempting to retrieve LICENSE");
+ comment = fish_sound_comment_first_byname (fsound, "LICENSE");
+
+ if (comment != NULL)
+ FAIL ("Removed comment incorrectly retrieved");
+
+ INFO ("+ Removing COPYRIGHT from local storage");
+ mycomment.name = "COPYRIGHT";
+ mycomment.value = COPYRIGHT;
+ err = fish_sound_comment_remove (fsound, &mycomment);
+ if (err != 1) FAIL ("Operation failed");
+
+ INFO ("+ Attempting to retrieve COPYRIGHT");
+ comment = fish_sound_comment_first_byname (fsound, "COPYRIGHT");
+
+ if (comment != NULL)
+ FAIL ("Removed comment incorrectly retrieved");
+
+ INFO ("Deleting FishSound (encode)");
+ fish_sound_delete (fsound);
+#endif /* FS_ENCODE */
+
+#if FS_DECODE
+ INFO ("Initializing FishSound for comments (decode)");
+ fsound = fish_sound_new (FISH_SOUND_DECODE, &fsinfo);
+
+ INFO ("+ Adding ARTIST1 byname (invalid for decode)");
+ err = fish_sound_comment_add_byname (fsound, "ARTIST", ARTIST1);
+
+ if (err == 0)
+ FAIL ("Operation disallowed");
+
+ INFO ("+ Removing ARTIST byname (invalid for decode)");
+ err = fish_sound_comment_remove_byname (fsound, "ARTIST");
+
+ if (err == 0)
+ FAIL ("Operation disallowed");
+
+ INFO ("Deleteing FishSound (decode)");
+ fish_sound_delete (fsound);
+#endif
+
+ exit (0);
+}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-audio.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,315 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <fishsound/fishsound.h>
+
+#include "fs_tests.h"
+
+#define DEBUG
+
+#define DEFAULT_ITER 2
+
+static void
+usage (char * progname)
+{
+ printf ("Usage: %s [options]\n\n", progname);
+ printf ("Options:\n");
+ printf (" --iter n Specify iterations per test (default %d)\n", DEFAULT_ITER);
+ printf (" --nasty Run with large test parameters\n");
+ printf (" --disable-vorbis Disable testing of Vorbis codec\n");
+ printf (" --disable-speex Disable testing of Speex codec\n");
+ printf (" --disable-interleave Disable testing of interleave\n");
+ printf (" --disable-non-interleave Disable testing of non-interleave\n");
+ exit (1);
+}
+
+/* For one-time tests, configure these by commandline args */
+static int * test_blocksizes, * test_samplerates, * test_channels;
+static int iter = DEFAULT_ITER;
+static int test_vorbis = 1, test_speex = 1;
+static int test_interleave = 1, test_non_interleave = 1;
+
+static int nasty_blocksizes[] = {128, 256, 512, 1024, 2048, 4096, 0};
+static int nasty_samplerates[] = {8000, 16000, 32000, 48000, 0};
+static int nasty_channels[] = {1, 2, 4, 5, 6, 8, 10, 16, 32, 0};
+
+static int default_blocksizes[] = {128, 1024, 0};
+static int default_samplerates[] = {8000, 48000, 0};
+static int default_channels[] = {1, 2, 6, 16, 0};
+
+typedef struct {
+ FishSound * encoder;
+ FishSound * decoder;
+ int interleave;
+ int channels;
+ float ** pcm;
+ long frames_in;
+ long frames_out;
+} FS_EncDec;
+
+static int
+decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+{
+ FS_EncDec * ed = (FS_EncDec *) user_data;
+
+ ed->frames_out += frames;
+
+ return 0;
+}
+
+static int
+encoded (FishSound * fsound, unsigned char * buf, long bytes, void * user_data)
+{
+ FS_EncDec * ed = (FS_EncDec *) user_data;
+ fish_sound_decode (ed->decoder, buf, bytes);
+ return 0;
+}
+
+/* Fill a PCM buffer with a squarish wave */
+static void
+fs_fill_square (float * pcm, int length)
+{
+ float value = 0.5;
+ int i;
+
+ for (i = 0; i < length; i++) {
+ pcm[i] = value;
+ if ((i % 100) == 0) {
+ value = -value;
+ }
+ }
+}
+
+static FS_EncDec *
+fs_encdec_new (int samplerate, int channels, int format, int interleave,
+ int blocksize)
+{
+ FS_EncDec * ed;
+ FishSoundInfo fsinfo;
+ int i;
+
+ ed = malloc (sizeof (FS_EncDec));
+
+ fsinfo.samplerate = samplerate;
+ fsinfo.channels = channels;
+ fsinfo.format = format;
+
+ ed->encoder = fish_sound_new (FISH_SOUND_ENCODE, &fsinfo);
+ ed->decoder = fish_sound_new (FISH_SOUND_DECODE, &fsinfo);
+
+ fish_sound_set_interleave (ed->encoder, interleave);
+ fish_sound_set_interleave (ed->decoder, interleave);
+
+ fish_sound_set_encoded_callback (ed->encoder, encoded, ed);
+ fish_sound_set_decoded_callback (ed->decoder, decoded, ed);
+
+ ed->interleave = interleave;
+ ed->channels = channels;
+
+ if (interleave) {
+ ed->pcm = (float **) malloc (sizeof (float) * channels * blocksize);
+ fs_fill_square ((float *)ed->pcm, channels * blocksize);
+ } else {
+ ed->pcm = (float **) malloc (sizeof (float *) * channels);
+ for (i = 0; i < channels; i++) {
+ ed->pcm[i] = (float *) malloc (sizeof (float) * blocksize);
+ fs_fill_square (ed->pcm[i], blocksize);
+ }
+ }
+
+ ed->frames_in = 0;
+ ed->frames_out = 0;
+
+ return ed;
+}
+
+static int
+fs_encdec_delete (FS_EncDec * ed)
+{
+ int i;
+
+ if (!ed) return -1;
+
+ fish_sound_delete (ed->encoder);
+ fish_sound_delete (ed->decoder);
+
+ if (!ed->interleave) {
+ for (i = 0; i < ed->channels; i++)
+ free (ed->pcm[i]);
+ }
+ free (ed->pcm);
+
+ free (ed);
+
+ return 0;
+}
+
+static int
+fs_encdec_test (int samplerate, int channels, int format, int interleave,
+ int blocksize)
+{
+ FS_EncDec * ed;
+ char msg[128];
+ int i;
+
+ snprintf (msg, 128,
+ "+ %2d channel %6d Hz %s, %d frame buffer (%s)",
+ channels, samplerate,
+ format == FISH_SOUND_VORBIS ? "Vorbis" : "Speex",
+ blocksize,
+ interleave ? "interleave" : "non-interleave");
+ INFO (msg);
+
+ ed = fs_encdec_new (samplerate, channels, format, interleave, blocksize);
+
+ for (i = 0; i < iter; i++) {
+ ed->frames_in += blocksize;
+ fish_sound_prepare_truncation (ed->encoder, ed->frames_in,
+ (i == (iter - 1)));
+ fish_sound_encode (ed->encoder, ed->pcm, blocksize);
+ }
+
+ fish_sound_flush (ed->encoder);
+
+ if (ed->frames_in != ed->frames_out) {
+ snprintf (msg, 128,
+ "%ld frames encoded, %ld frames decoded",
+ ed->frames_in, ed->frames_out);
+ WARN (msg);
+ }
+
+ fs_encdec_delete (ed);
+
+ return 0;
+}
+
+static void
+parse_args (int argc, char * argv[])
+{
+ int i;
+
+ for (i = 1; i < argc; i++) {
+ if (!strcmp (argv[i], "--nasty")) {
+ test_blocksizes = nasty_blocksizes;
+ test_samplerates = nasty_samplerates;
+ test_channels = nasty_channels;
+ } else if (!strcmp (argv[i], "--iter")) {
+ i++; if (i >= argc) usage(argv[0]);
+ iter = atoi (argv[i]);
+ } else if (!strcmp (argv[i], "--disable-vorbis")) {
+ test_vorbis = 0;
+ } else if (!strcmp (argv[i], "--disable-speex")) {
+ test_speex = 0;
+ } else if (!strcmp (argv[i], "--disable-interleave")) {
+ test_interleave = 0;
+ } else if (!strcmp (argv[i], "--disable-non-interleave")) {
+ test_non_interleave = 0;
+ } else if (!strcmp (argv[i], "--help") || !strcmp (argv[i], "-h")) {
+ usage(argv[0]);
+ }
+ }
+
+ INFO ("Testing encode/decode pipeline for audio");
+
+ /* Report abnormal options */
+
+ if (test_blocksizes == nasty_blocksizes)
+ INFO ("* Running NASTY large test parameters");
+
+ if (!test_vorbis) INFO ("* DISABLED testing of Vorbis");
+ if (!test_speex) INFO ("* DISABLED testing of Speex");
+ if (!test_interleave) INFO ("* DISABLED testing of INTERLEAVE");
+ if (!test_non_interleave) INFO ("* DISABLED testing of NON-INTERLEAVE");
+}
+
+int
+main (int argc, char * argv[])
+{
+ int b, s, c;
+
+ test_blocksizes = default_blocksizes;
+ test_samplerates = default_samplerates;
+ test_channels = default_channels;
+
+ parse_args (argc, argv);
+
+ for (b = 0; test_blocksizes[b]; b++) {
+ for (s = 0; test_samplerates[s]; s++) {
+ for (c = 0; test_channels[c]; c++) {
+
+ if (test_non_interleave) {
+ /* Test VORBIS */
+ if (test_vorbis) {
+ fs_encdec_test (test_samplerates[s], test_channels[c],
+ FISH_SOUND_VORBIS, 0, test_blocksizes[b]);
+ }
+
+ /* Test SPEEX */
+ if (test_speex) {
+ if (test_channels[c] <= 2) {
+ fs_encdec_test (test_samplerates[s], test_channels[c],
+ FISH_SOUND_SPEEX, 0, test_blocksizes[b]);
+
+ }
+ }
+ }
+
+ if (test_interleave) {
+ /* Test VORBIS */
+ if (test_vorbis) {
+ fs_encdec_test (test_samplerates[s], test_channels[c],
+ FISH_SOUND_VORBIS, 1, test_blocksizes[b]);
+ }
+
+ /* Test SPEEX */
+ if (test_speex) {
+ if (test_channels[c] <= 2) {
+ fs_encdec_test (test_samplerates[s], test_channels[c],
+ FISH_SOUND_SPEEX, 1, test_blocksizes[b]);
+
+ }
+ }
+ }
+
+
+ }
+ }
+ }
+
+ exit (0);
+}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-comments.c
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-comments.c 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/encdec-comments.c 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,230 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <fishsound/fishsound.h>
+
+#include "fs_tests.h"
+
+#define DEBUG
+
+#define ARTIST1 "Trout Junkies"
+#define ARTIST2 "DJ Fugu"
+#define COPYRIGHT "Copyright (C) 2004. Some Rights Reserved."
+#define LICENSE "Creative Commons Attribute Share-Alike v1.0"
+
+typedef struct {
+ FishSound * encoder;
+ FishSound * decoder;
+ float ** pcm;
+} FS_EncDec;
+
+static int
+decoded (FishSound * fsound, float ** pcm, long frames, void * user_data)
+{
+ const FishSoundComment * comment;
+
+ INFO ("+ Retrieving first (expect ARTIST1)");
+ comment = fish_sound_comment_first (fsound);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted ARTIST1 not retrieved");
+
+ if (strcmp (comment->name, "ARTIST"))
+ FAIL ("Incorrect ARTIST1 name found");
+
+ if (strcmp (comment->value, ARTIST1))
+ FAIL ("Incorrect ARTIST1 value found");
+
+ INFO ("+ Retrieving next (expect COPYRIGHT)");
+ comment = fish_sound_comment_next (fsound, comment);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted COPYRIGHT not retrieved");
+
+ if (strcmp (comment->name, "COPYRIGHT"))
+ FAIL ("Incorrect COPYRIGHT name found");
+
+ if (strcmp (comment->value, COPYRIGHT))
+ FAIL ("Incorrect COPYRIGHT value found");
+
+ INFO ("+ Retrieving next (expect LICENSE)");
+ comment = fish_sound_comment_next (fsound, comment);
+
+ if (comment == NULL)
+ FAIL ("Recently inserted LICENSE not retrieved");
+
+ if (strcmp (comment->name, "LICENSE"))
+ FAIL ("Incorrect LICENSE name found");
+
+ if (strcmp (comment->value, LICENSE))
+ FAIL ("Incorrect LICENSE value found");
+
+ INFO ("+ Retrieving first ARTIST using wierd caps (expect ARTIST1)");
+ comment = fish_sound_comment_first_byname (fsound, "ArTiSt");
+
+ if (comment == NULL)
+ FAIL ("First artist ARTIST1 not retrieved");
+
+ if (strcmp (comment->name, "ARTIST"))
+ FAIL ("Incorrect ARTIST1 name found");
+
+ if (strcmp (comment->value, ARTIST1))
+ FAIL ("Incorrect ARTIST1 value found");
+
+ INFO ("+ Retrieving next ARTIST (expect ARTIST2)");
+ comment = fish_sound_comment_next_byname (fsound, comment);
+
+ if (comment == NULL)
+ FAIL ("Next artist ARTIST2 not retrieved");
+
+ if (strcmp (comment->name, "ARTIST"))
+ FAIL ("Incorrect ARTIST2 name found");
+
+ if (strcmp (comment->value, ARTIST2))
+ FAIL ("Incorrect ARTIST2 value found");
+
+ return 0;
+}
+
+static int
+encoded (FishSound * fsound, unsigned char * buf, long bytes, void * user_data)
+{
+ FS_EncDec * ed = (FS_EncDec *) user_data;
+ fish_sound_decode (ed->decoder, buf, bytes);
+ return 0;
+}
+
+/* Fill a PCM buffer with a squarish wave */
+static void
+fs_fill_square (float * pcm, int length)
+{
+ float value = 0.5;
+ int i;
+
+ for (i = 0; i < length; i++) {
+ pcm[i] = value;
+ if ((i % 100) == 0) {
+ value = -value;
+ }
+ }
+}
+
+static FS_EncDec *
+fs_encdec_new (int format, int blocksize)
+{
+ FS_EncDec * ed;
+ FishSoundInfo fsinfo;
+
+ ed = malloc (sizeof (FS_EncDec));
+
+ fsinfo.samplerate = 8000;
+ fsinfo.channels = 1;
+ fsinfo.format = format;
+
+ ed->encoder = fish_sound_new (FISH_SOUND_ENCODE, &fsinfo);
+ ed->decoder = fish_sound_new (FISH_SOUND_DECODE, &fsinfo);
+
+ fish_sound_set_interleave (ed->encoder, 1);
+ fish_sound_set_interleave (ed->decoder, 1);
+
+ fish_sound_set_encoded_callback (ed->encoder, encoded, ed);
+ fish_sound_set_decoded_callback (ed->decoder, decoded, ed);
+
+ ed->pcm = (float **) malloc (sizeof (float) * blocksize);
+ fs_fill_square ((float *)ed->pcm, blocksize);
+
+ return ed;
+}
+
+static int
+fs_encdec_delete (FS_EncDec * ed)
+{
+ if (!ed) return -1;
+
+ fish_sound_delete (ed->encoder);
+ fish_sound_delete (ed->decoder);
+ free (ed);
+
+ return 0;
+}
+
+static int
+fs_encdec_comments_test (int format, int blocksize)
+{
+ FS_EncDec * ed;
+ FishSoundComment mycomment;
+ int err;
+
+ ed = fs_encdec_new (format, blocksize);
+
+ INFO ("+ Adding ARTIST1 byname");
+ err = fish_sound_comment_add_byname (ed->encoder, "ARTIST", ARTIST1);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Adding COPYRIGHT byname");
+ err = fish_sound_comment_add_byname (ed->encoder, "COPYRIGHT", COPYRIGHT);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Adding LICENSE from local storage");
+ mycomment.name = "LICENSE";
+ mycomment.value = LICENSE;
+ err = fish_sound_comment_add (ed->encoder, &mycomment);
+ if (err < 0) FAIL ("Operation failed");
+
+ INFO ("+ Adding ARTIST2 byname");
+ err = fish_sound_comment_add_byname (ed->encoder, "ARTIST", ARTIST2);
+ if (err < 0) FAIL ("Operation failed");
+
+ fish_sound_encode (ed->encoder, ed->pcm, blocksize);
+
+ fs_encdec_delete (ed);
+
+ return 0;
+}
+
+int
+main (int argc, char * argv[])
+{
+ INFO ("Testing encode/decode pipeline for comments: VORBIS");
+ fs_encdec_comments_test (FISH_SOUND_VORBIS, 2048);
+
+ INFO ("Testing encode/decode pipeline for comments: SPEEX");
+ fs_encdec_comments_test (FISH_SOUND_SPEEX, 2048);
+
+ exit (0);
+}
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_tests.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_tests.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/src/tests/fs_tests.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,45 @@
+/*
+ Copyright (C) 2003 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ - Neither the name of CSIRO Australia nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define INFO(str) \
+ { printf ("---- %s ...\n", (str)); fflush (stdout); }
+
+#define WARN(str) \
+ { printf ("%s:%d: warning: %s\n", __FILE__, __LINE__, (str)); fflush (stdout); }
+
+#define FAIL(str) \
+ { printf ("%s:%d: %s\n", __FILE__, __LINE__, (str)); fflush (stdout); exit(1); }
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/Makefile
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/Makefile 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/Makefile 2004-05-25 14:19:54 UTC (rev 6754)
@@ -21,7 +21,7 @@
#====================================================================
# Targets
-ALL : "libfishsound.dll" "identify.exe" "encode.exe" "decode.exe"
+ALL : "libfishsound.dll" "fishsound-identify.exe" "fishsound-info.exe" "fishsound-encode.exe" "fishsound-decode.exe"
CLEAN:
- at erase ".\*.obj"
@@ -34,37 +34,49 @@
LINK32_OBJS= \
".\fishsound.obj" \
+ ".\comments.obj" \
".\speex.obj" \
- ".\vorbis.obj"
+ ".\vorbis.obj" \
+ ".\fs_vector.obj"
"libfishsound.dll" : $(LINK32_OBJS) ".\libfishsound\libfishsound.def"
$(LINK32) $(LINK32_FLAGS) /def:".\libfishsound\libfishsound.def" $(LINK32_OBJS)
-"identify.exe" : "..\src\examples\identify.c"
- $(CPP) $(CFLAGS) /Fo".\identify.obj" /c "..\src\examples\identify.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:"identify.exe" ".\identify.obj" liboggz.lib libfishsound.lib
+"fishsound-identify.exe" : "..\src\examples\fishsound-identify.c"
+ $(CPP) $(CFLAGS) /Fo".\fishsound-identify.obj" /c "..\src\examples\fishsound-identify.c"
+ $(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-identify.exe" ".\fishsound-identify.obj" liboggz.lib libfishsound.lib
-"encode.exe" : "..\src\examples\encode.c"
- $(CPP) $(CFLAGS) /Fo".\encode.obj" /c "..\src\examples\encode.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:"encode.exe" ".\encode.obj" liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib
+"fishsound-info.exe" : "..\src\examples\fishsound-info.c"
+ $(CPP) $(CFLAGS) /Fo".\fishsound-info.obj" /c "..\src\examples\fishsound-info.c"
+ $(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-info.exe" ".\fishsound-info.obj" liboggz.lib libfishsound.lib
-"decode.exe" : "..\src\examples\decode.c"
- $(CPP) $(CFLAGS) /Fo".\decode.obj" /c "..\src\examples\decode.c"
- $(LINK32) $(PROG_LINK_FLAGS) /out:"decode.exe" ".\decode.obj" liboggz.lib libfishsound.lib libspeex.lib vorbis.lib libsndfile.lib
+"fishsound-encode.exe" : "..\src\examples\fishsound-encode.c"
+ $(CPP) $(CFLAGS) /Fo".\fishsound-encode.obj" /c "..\src\examples\fishsound-encode.c"
+ $(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-encode.exe" ".\fishsound-encode.obj" liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib
+"fishsound-decode.exe" : "..\src\examples\fishsound-decode.c"
+ $(CPP) $(CFLAGS) /Fo".\fishsound-decode.obj" /c "..\src\examples\fishsound-decode.c"
+ $(LINK32) $(PROG_LINK_FLAGS) /out:"fishsound-decode.exe" ".\fishsound-decode.obj" liboggz.lib libfishsound.lib libspeex.lib vorbis.lib libsndfile.lib
+
#====================================================================
# C files in src
.\fishsound.obj:
$(CPP) $(CFLAGS) /Fo".\fishsound.obj" /c "..\src\libfishsound\fishsound.c"
+.\comments.obj:
+ $(CPP) $(CFLAGS) /Fo".\comments.obj" /c "..\src\libfishsound\comments.c"
+
.\speex.obj:
$(CPP) $(CFLAGS) /Fo".\speex.obj" /c "..\src\libfishsound\speex.c"
.\vorbis.obj:
$(CPP) $(CFLAGS) /Fo".\vorbis.obj" /c "..\src\libfishsound\vorbis.c"
+.\fs_vector.obj:
+ $(CPP) $(CFLAGS) /Fo".\fs_vector.obj" /c "..\src\libfishsound\fs_vector.c"
+
# End of Makefile
#====================================================================
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/decode.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/decode.dsp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/decode.dsp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -42,7 +42,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Ze /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -51,7 +51,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-decode.exe" /libpath:".\\"
!ELSEIF "$(CFG)" == "decode - Win32 Debug"
@@ -67,7 +67,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Ze /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -76,7 +76,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-decode.exe" /pdbtype:sept /libpath:".\\"
!ENDIF
@@ -89,7 +89,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\src\examples\decode.c
+SOURCE="..\src\examples\fishsound-decode.c"
# End Source File
# End Group
# Begin Group "Header Files"
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encode.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encode.dsp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/encode.dsp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -51,7 +51,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-encode.exe" /libpath:".\\"
!ELSEIF "$(CFG)" == "encode - Win32 Debug"
@@ -76,7 +76,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib liboggz.lib libfishsound.lib libspeex.lib libsndfile.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-encode.exe" /pdbtype:sept /libpath:".\\"
!ENDIF
@@ -89,7 +89,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\src\examples\encode.c
+SOURCE="..\src\examples\fishsound-encode.c"
# End Source File
# End Group
# Begin Group "Header Files"
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/identify.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/identify.dsp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/identify.dsp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -42,7 +42,8 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Ze /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -50,7 +51,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 libspeex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /machine:I386 /libpath:".\\"
+# ADD LINK32 libspeex.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-identify.exe" /libpath:".\\"
!ELSEIF "$(CFG)" == "identify - Win32 Debug"
@@ -66,7 +67,8 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Ze /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -74,7 +76,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:".\\"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-identify.exe" /pdbtype:sept /libpath:".\\"
!ENDIF
@@ -87,7 +89,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\src\examples\identify.c
+SOURCE="..\src\examples\fishsound-identify.c"
# End Source File
# End Group
# Begin Group "Header Files"
Added: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/info.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/info.dsp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/info.dsp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="info" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Console Application" 0x0103
+
+CFG=info - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE
+!MESSAGE NMAKE /f "info.mak".
+!MESSAGE
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "info.mak" CFG="info - Win32 Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "info - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "info - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
+!IF "$(CFG)" == "info - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /machine:I386 /out:"fishsound-info.exe" /libpath:".\\"
+
+!ELSEIF "$(CFG)" == "info - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ogg.lib vorbis.lib libspeex.lib libfishsound.lib liboggz.lib /nologo /subsystem:console /debug /machine:I386 /out:"fishsound-info.exe" /pdbtype:sept /libpath:".\\"
+
+!ENDIF
+
+# Begin Target
+
+# Name "info - Win32 Release"
+# Name "info - Win32 Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE="..\src\examples\fishsound-info.c"
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# Begin Source File
+
+SOURCE=.\config.h
+# End Source File
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.def
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.def 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound/libfishsound.def 2004-05-25 14:19:54 UTC (rev 6754)
@@ -1,14 +1,26 @@
-LIBRARY libfishsound.dll
-EXPORTS
- fish_sound_identify
- fish_sound_new
- fish_sound_set_decoded_callback
- fish_sound_set_encoded_callback
- fish_sound_decode
- fish_sound_encode
+LIBRARY libfishsound.dll
+EXPORTS
+ fish_sound_identify
+ fish_sound_new
+ fish_sound_set_decoded_callback
+ fish_sound_set_encoded_callback
+ fish_sound_decode
+ fish_sound_encode
fish_sound_reset
- fish_sound_flush
- fish_sound_delete
- fish_sound_command
- fish_sound_get_interleave
- fish_sound_set_interleave
\ No newline at end of file
+ fish_sound_flush
+ fish_sound_delete
+ fish_sound_command
+ fish_sound_get_interleave
+ fish_sound_set_interleave
+ fish_sound_get_frameno
+ fish_sound_set_frameno
+ fish_sound_prepare_truncation
+ fish_sound_comment_get_vendor
+ fish_sound_comment_first
+ fish_sound_comment_next
+ fish_sound_comment_first_byname
+ fish_sound_comment_next_byname
+ fish_sound_comment_add
+ fish_sound_comment_add_byname
+ fish_sound_comment_remove
+ fish_sound_comment_remove_byname
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsp
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /Ze /W3 /Gi- /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\include\\" /I ".\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /Ze /W3 /Gm /Gi- /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\include\\" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBFISHSOUND_EXPORTS" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -96,10 +96,18 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
+SOURCE=..\src\libfishsound\comments.c
+# End Source File
+# Begin Source File
+
SOURCE=..\src\libfishsound\fishsound.c
# End Source File
# Begin Source File
+SOURCE=..\src\libfishsound\fs_vector.c
+# End Source File
+# Begin Source File
+
SOURCE=.\libfishsound\libfishsound.def
# End Source File
# Begin Source File
@@ -128,6 +136,14 @@
# End Source File
# Begin Source File
+SOURCE=..\src\libfishsound\fs_compat.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\src\libfishsound\fs_vector.h
+# End Source File
+# Begin Source File
+
SOURCE=..\src\libfishsound\private.h
# End Source File
# End Group
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsw
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsw 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.dsw 2004-05-25 14:19:54 UTC (rev 6754)
@@ -48,6 +48,18 @@
###############################################################################
+Project: "info"=.\info.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
Project: "libfishsound"=.\libfishsound.dsp - Package Owner=<4>
Package=<5>
@@ -56,6 +68,9 @@
Package=<4>
{{{
+ Begin Project Dependency
+ Project_Dep_Name info
+ End Project Dependency
}}}
###############################################################################
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.exp
===================================================================
(Binary files differ)
Modified: trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj
===================================================================
--- trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/helper/libfishsound/win32/libfishsound.vcproj 2004-05-25 14:19:54 UTC (rev 6754)
@@ -145,9 +145,15 @@
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
<File
+ RelativePath="..\src\libfishsound\comments.c">
+ </File>
+ <File
RelativePath="..\src\libfishsound\fishsound.c">
</File>
<File
+ RelativePath="..\src\libfishsound\fs_vector.c">
+ </File>
+ <File
RelativePath=".\libfishsound\libfishsound.def">
</File>
<File
@@ -170,6 +176,9 @@
RelativePath="..\include\fishsound\fishsound.h">
</File>
<File
+ RelativePath="..\src\libfishsound\fs_vector.h">
+ </File>
+ <File
RelativePath="..\src\libfishsound\private.h">
</File>
</Filter>
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.cpp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -35,11 +35,12 @@
SpeexEncodeInputPin::SpeexEncodeInputPin(AbstractAudioEncodeFilter* inParentFilter, CCritSec* inFilterLock, AbstractAudioEncodeOutputPin* inOutputPin)
: AbstractAudioEncodeInputPin(inParentFilter, inFilterLock, inOutputPin, NAME("SpeexEncodeInputPin"), L"PCM In")
{
-
+ debugLog.open("C:\\temp\\speexenc.log", ios_base::out);
}
SpeexEncodeInputPin::~SpeexEncodeInputPin(void)
{
+ debugLog.close();
DestroyCodec();
}
@@ -48,14 +49,17 @@
long SpeexEncodeInputPin::encodeData(unsigned char* inBuf, long inNumBytes) {
-
+ debugLog << "encodeData receives : "<<inNumBytes<<" bytes"<<endl;
float* locFloatBuf = new float[inNumBytes/2];
short locTempShort = 0;
float locTempFloat = 0;
__int64 locGranPos = 0;
- fish_sound_command(mFishSound, 8, &locGranPos, sizeof(__int64));
+ //Removed hack for gran pos
+ //fish_sound_command(mFishSound, 8, &locGranPos, sizeof(__int64));
+ //
+ locGranPos = fish_sound_get_frameno(mFishSound);
mUptoFrame = locGranPos;
//__int64 locTemp = ((FishSoundSpeexInfo*)mFishSound->codec_data)->vd.pcm_returned;
for (int i = 0; i < inNumBytes; i += 2) {
@@ -64,6 +68,7 @@
locTempFloat /= 32767.0;
locFloatBuf[i/2] = locTempFloat;;
}
+ debugLog<<"Calling encode"<<endl;
//FIX::: The 2 is the size of a sample ie 16 bits
long locErr = fish_sound_encode(mFishSound, (float**)locFloatBuf, inNumBytes/(mFishInfo.channels*2));
delete locFloatBuf;
@@ -106,18 +111,20 @@
//For convenience we do all these cast once and for all here.
SpeexEncodeInputPin* locThis = reinterpret_cast<SpeexEncodeInputPin*> (inThisPointer);
SpeexEncodeFilter* locFilter = reinterpret_cast<SpeexEncodeFilter*>(locThis->m_pFilter);
-
+ locThis->debugLog << "SpeexEncoded called with "<<inNumBytes<< " byte of data"<<endl;
//Time stamps are granule pos not directshow times
LONGLONG locFrameStart = 0;
LONGLONG locFrameEnd = locThis->mUptoFrame;
+ locThis->debugLog << "Stamping packet "<<locFrameStart<< " to "<<locFrameEnd<<endl;
//Get a pointer to a new sample stamped with our time
IMediaSample* locSample;
HRESULT locHR = locThis->mOutputPin->GetDeliveryBuffer(&locSample, &locFrameStart, &locFrameEnd, NULL);
if (FAILED(locHR)) {
//We get here when the application goes into stop mode usually.
+ locThis->debugLog<<"Getting buffer failed"<<endl;
return locHR;
}
@@ -143,8 +150,9 @@
//locSample->AddRef();
HRESULT locHR = locThis->mOutputPin->mDataQueue->Receive(locSample); //->DownstreamFilter()->Receive(locSample);
if (locHR != S_OK) {
-
+ locThis->debugLog<<"Sample rejected"<<endl;
} else {
+ locThis->debugLog<<"Sample Delivered"<<endl;
}
}
Modified: trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h
===================================================================
--- trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/speex/filters/dsfSpeexEncoder/SpeexEncodeInputPin.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -42,6 +42,8 @@
//#include <../src/libfishsound/private.h>
}
+#include <fstream>
+using namespace std;
class SpeexEncodeInputPin
: public AbstractAudioEncodeInputPin
{
@@ -62,6 +64,7 @@
//SpeexDecodeOutputPin* mOutputPin;
//__int64 mUptoFrame;
+ fstream debugLog;
FishSound* mFishSound;
FishSoundInfo mFishInfo;
Modified: trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/theora/libs/libOOTheora/TheoraDecoder.cpp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -63,6 +63,7 @@
theora_decode_init(&mTheoraState, &mTheoraInfo);
mFirstPacket = false;
}
+
theora_decode_packetin(&mTheoraState, simulateOldOggPacket(inPacket));
int locRetVal = theora_decode_YUVout(&mTheoraState, &mYUVBuffer);
Modified: trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/vorbis/filters/dsfVorbisEncoder/VorbisEncodeInputPin.cpp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -55,7 +55,11 @@
float locTempFloat = 0;
__int64 locGranPos = 0;
- fish_sound_command(mFishSound, 7, &locGranPos, sizeof(__int64));
+ locGranPos = fish_sound_get_frameno(mFishSound);
+ //Removed the hack
+ //fish_sound_command(mFishSound, 7, &locGranPos, sizeof(__int64));
+ //
+
mUptoFrame = locGranPos;
//__int64 locTemp = ((FishSoundVorbisInfo*)mFishSound->codec_data)->vd.pcm_returned;
for (int i = 0; i < inNumBytes; i += 2) {
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/BuildLog.htm 2004-05-25 14:19:54 UTC (rev 6754)
@@ -14,13 +14,12 @@
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre> ALLUSERSPROFILE=C:\Documents and Settings\All Users
APPDATA=C:\Documents and Settings\illiminable\Application Data
APR_ICONV_PATH=G:\Program Files\Subversion\iconv
- CLIENTNAME=Console
CommonProgramFiles=C:\Program Files\Common Files
COMPUTERNAME=TIGER
ComSpec=C:\WINDOWS\system32\cmd.exe
DX_SDK=c:\dxsdk
HOMEDRIVE=C:
- HOMEPATH=\
+ HOMEPATH=\Documents and Settings\illiminable
INCLUDE=C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib
LIBPATH=
@@ -46,8 +45,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug/vorbis_d.exp
===================================================================
(Binary files differ)
Added: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.cpp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,53 @@
+#include "StdAfx.h"
+#include "oggmuxstream.h"
+
+OggMuxStream::OggMuxStream(void)
+ : mIsEOS(true)
+{
+}
+
+OggMuxStream::~OggMuxStream(void)
+{
+ //Need to delete the contents of the queue later.
+}
+
+bool OggMuxStream::acceptOggPage(OggPage* inOggPage) {
+ mIsEOS = false;
+ mPageQueue.push_back(inOggPage);
+ return true;
+}
+
+OggPage* OggMuxStream::popFront() {
+ OggPage* retPage = NULL;
+ if (!mPageQueue.empty()) {
+ retPage = mPageQueue.front();
+ mPageQueue.pop_front();
+ }
+ return retPage;
+}
+const OggPage* OggMuxStream::peekfront() {
+ OggPage* retPage = NULL;
+ if (!mPageQueue.empty()) {
+ retPage = mPageQueue.front();
+
+ }
+ return retPage;
+}
+__int64 OggMuxStream::frontTime() {
+ __int64 retTime = INT64_MAX;
+ if (!mPageQueue.empty()) {
+ retTime = mPageQueue.front()->header()->GranulePos()->value();
+ }
+ return retTime;
+}
+
+bool OggMuxStream::isEmpty() {
+ return mPageQueue.empty();
+}
+bool OggMuxStream::isEOS() {
+ return mIsEOS;
+}
+
+void OggMuxStream::setIsEOS(bool inIsEOS) {
+ mIsEOS = inIsEOS;
+}
\ No newline at end of file
Added: trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/OggMuxStream.h 2004-05-25 14:19:54 UTC (rev 6754)
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "OggPage.h"
+#include "IOggCallback.h"
+#include <deque>
+using namespace std;
+class OggMuxStream
+ : public IOggCallback
+{
+public:
+ OggMuxStream(void);
+ virtual ~OggMuxStream(void);
+ static const __int64 INT64_MAX = 9223372036854775807;
+
+ virtual bool acceptOggPage(OggPage* inOggPage);
+ virtual OggPage* popFront();
+ virtual const OggPage* peekfront();
+ virtual __int64 frontTime();
+ virtual bool isEmpty();
+ virtual bool isEOS();
+ virtual void setIsEOS(bool inIsEOS);
+
+protected:
+ bool mIsEOS;
+ deque<OggPage*> mPageQueue;
+
+};
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOgg/libOOOgg.vcproj 2004-05-25 14:19:54 UTC (rev 6754)
@@ -145,6 +145,9 @@
RelativePath="OggMath.cpp">
</File>
<File
+ RelativePath="OggMuxStream.cpp">
+ </File>
+ <File
RelativePath="OggPacket.cpp">
</File>
<File
@@ -224,6 +227,9 @@
RelativePath="OggMath.h">
</File>
<File
+ RelativePath="OggMuxStream.h">
+ </File>
+ <File
RelativePath="OggPacket.h">
</File>
<File
Modified: trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/core/ogg/libOOOggSeek/AutoOggSeekTable.cpp 2004-05-25 14:19:54 UTC (rev 6754)
@@ -75,6 +75,7 @@
mSerialNoToTrack = inOggPage->header()->StreamSerialNo();
mGranulePosShift = (((inOggPage->getPacket(0)->packetData()[40]) % 4) << 3) + ((inOggPage->getPacket(0)->packetData()[41]) >> 5);
mSampleRate = FLACMath::charArrToULong(inOggPage->getPacket(0)->packetData() + 22) / FLACMath::charArrToULong(inOggPage->getPacket(0)->packetData() + 26);
+ mNumHeaders = 3;
//Need denominators
//mTheoraFormatBlock->frameRateDenominator = FLACMath::charArrToULong(locIdentHeader + 26);
} else {
@@ -86,8 +87,8 @@
if (mSerialNoToTrack == inOggPage->header()->StreamSerialNo()) {
- if ((mPacketCount > 3) && (mLastIsSeekable == true)) {
- //if ((mPacketCount > mNumHeaders) && (inOggPage->header()->HeaderFlags() & 1 != 1)) {
+ //if ((mPacketCount > 3) && (mLastIsSeekable == true)) {
+ if ((mPacketCount > mNumHeaders) && ((inOggPage->header()->HeaderFlags() & 1) != 1)) {
addSeekPoint(mLastSeekTime, mFilePos);
}
@@ -108,7 +109,7 @@
mLastSeekTime = ((inOggPage->header()->GranulePos()->value()) * DS_UNITS) / mSampleRate;
//stDebug<<"Last Seek Time : "<<mLastSeekTime;
}
- if ((inOggPage->header()->HeaderFlags() & 1 == 1)) {
+ if (((inOggPage->header()->HeaderFlags() & 1) == 1)) {
//stDebug <<" NOT SEEKABLE";
mLastIsSeekable = false;
}
Modified: trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm
===================================================================
--- trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/BuildLog.htm 2004-05-25 14:19:54 UTC (rev 6754)
@@ -14,13 +14,12 @@
</font></table><table width=* cellspacing=0 cellpadding=0><tr><td width=0 bgcolor=#EDEDF5> </td><td width=0 bgcolor=#FFFFFF> </td><td width=*><pre> ALLUSERSPROFILE=C:\Documents and Settings\All Users
APPDATA=C:\Documents and Settings\illiminable\Application Data
APR_ICONV_PATH=G:\Program Files\Subversion\iconv
- CLIENTNAME=Console
CommonProgramFiles=C:\Program Files\Common Files
COMPUTERNAME=TIGER
ComSpec=C:\WINDOWS\system32\cmd.exe
DX_SDK=c:\dxsdk
HOMEDRIVE=C:
- HOMEPATH=\
+ HOMEPATH=\Documents and Settings\illiminable
INCLUDE=C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib
LIBPATH=
@@ -46,8 +45,8 @@
VSCOMNTOOLS="C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\"
windir=C:\WINDOWS
_ACP_ATLPROV=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin\ATLPROV.DLL
- _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioDecoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\..\core\directshow\dsfSeeking;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
- _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;..\libOOOgg;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_INCLUDE="C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
+ _ACP_LIB=C:\DXSDK\Lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\lib;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\lib;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\lib;"C:\DXSDK\Samples\C++\DirectShow\BaseClasses";C:\DXSDK\Include;..\..\..\..\core\directshow\dsfAbstractAudioEncoder;..\..\..\..\core\ogg\libOOOgg;..\..\..\helper\libfishsound\include;..\..\..\helper\libfishsound\win32;C:\DXSDK\Include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\atlmfc\include;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Vc7\PlatformSDK\include;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\include
_ACP_PATH=C:\Program Files\Microsoft Visual Studio .NET\Vc7\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin\prerelease;C:\Program Files\Microsoft Visual Studio .NET\Common7\Tools\bin;C:\Program Files\Microsoft Visual Studio .NET\Common7\tools;C:\Program Files\Microsoft Visual Studio .NET\Common7\ide;C:\Program Files\HTML Help Workshop\;C:\Program Files\Microsoft Visual Studio .NET\FrameworkSDK\bin;C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\Program Files\ATI Technologies\ATI Control Panel
</pre></table><table width=100% bgcolor=#DFDFE5><tr><td><font face=arial size=+2>
Command Lines
Modified: trunk/oggdsf/src/lib/core/ogg/libogg/win32/Dynamic_Debug/ogg_d.exp
===================================================================
(Binary files differ)
Modified: trunk/oggdsf/website/index.html
===================================================================
--- trunk/oggdsf/website/index.html 2004-05-25 12:30:58 UTC (rev 6753)
+++ trunk/oggdsf/website/index.html 2004-05-25 14:19:54 UTC (rev 6754)
@@ -36,13 +36,11 @@
Also any other windows application that uses directshow will also be vorbis/speex/flac/theora compatible.
<br>
<br>
-<b><u>Current Version (0.56.6741) - 21/05/2004</u></b><br>
-Most of the changes in this build are internal modifications to better deal with the need to determine start times of all samples in order to properly synchronise multi-stream files. The main externally visible change is the limited ability to seek in theora files without total loss of synch. There are still a few issues to be ironed out though.
+<b><u>Current Version (0.57.6744) - 22/05/2004</u></b><br>
+Previous release a few hours ago had hundreds of debug statements in the release build. It may have created log files in your C:\ Root directory as well as C:\temp and possibly in G:\ if you have a writable G drive. Sorry if you got this a few hours ago.
<br>
- <li>Modified internal timestamping mechanism, to allow resynch easier in theora.</li>
- <li>Now able to seek in theora (not to keyframe), but occasionally crashes after seek.</li>
- <li>Speex and vorbis, don't have seg fault any more, though very rarely after a seek there is no audio. Another seek fixes it.</li>
- <li>Added simple new tool called OOOggStat, to give info on contained streams.</li>
+ <li>Removed a whole heap of debugging code.</li>
+ <li>See 0.56.6741 release below for latest changes.</li>
<br>
<b><u>Known issues.</u></b><br>
@@ -71,11 +69,11 @@
</TD>
<TD width=40%><FONT size=2 color="#000000" face="Arial">
-<DIV><div align="right">768,952 bytes</div></DIV></FONT>
+<DIV><div align="right">759,287 bytes</div></DIV></FONT>
</TD>
<TD width=40%><FONT size=2 color="#000000" face="Arial">
-<DIV><div align="right">Download Now</div></DIV></FONT>
+<DIV><div align="right">Download Now</div></DIV></FONT>
</TD>
</TR>
@@ -85,11 +83,11 @@
</TD>
<TD width=40%><FONT size=2 color="#000000" face="Arial">
-<DIV><div align="right">4,218,972 bytes</div></DIV></FONT>
+<DIV><div align="right">4,209,307 bytes</div></DIV></FONT>
</TD>
<TD width=40%><FONT size=2 color="#000000" face="Arial">
-<DIV><div align="right">Download Now</div></DIV></FONT>
+<DIV><div align="right">Download Now</div></DIV></FONT>
</TD>
</TR>
@@ -97,6 +95,15 @@
</DIV>
</FONT>
<br>
+<b><u>Previous Version (0.56.6741) - 21/05/2004</u></b><br>
+Most of the changes in this build are internal modifications to better deal with the need to determine start times of all samples in order to properly synchronise multi-stream files. The main externally visible change is the limited ability to seek in theora files without total loss of synch. There are still a few issues to be ironed out though.
+<br>
+ <li>Modified internal timestamping mechanism, to allow resynch easier in theora.</li>
+ <li>Now able to seek in theora (not to keyframe), but occasionally crashes after seek.</li>
+ <li>Speex and vorbis, don't have seg fault any more, though very rarely after a seek there is no audio. Another seek fixes it.</li>
+ <li>Added simple new tool called OOOggStat, to give info on contained streams.</li>
+
+<br>
<b><u>Previous Version (0.55.0115) - 27/04/2004</u></b><br>
Vorbis and speex playback are now pretty much finished bar the very rare bug I mention below. I've played dozens of speex and vorbis files and they all seem just fine. Pretty much fully functional.<br>
The track duration shows up incorrectly in all codecs besides speex and vorbis because I haven't coded it yet !<br>
--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to '<a href="mailto:cvs-request at xiph.org?Subject=Re:%20[xiph-cvs]%20r6754%20-%20in%20trunk/oggdsf:%20.%20src/lib/codecs/flac/libs/libflac/src/libFLAC/Debug_dynamic%20src/lib/codecs/flac/libs/libflac/src/libFLAC%2B%2B/Debug_dynamic%20src/lib/codecs/helper/libfishsound%20src/lib/codecs/helper/libfishsound/doc%20src/lib/codecs/helper/libfishsound/doc/libfishsound/html%20src/lib/codecs/helper/libfishsound/doc/libfishsound/latex%20src/lib/codecs/helper/libfishsound/include%20src/lib/codecs/helper/libfishsound/include/fishsound%20src/lib/codecs/helper/libfishsound/src%20src/lib/codecs/helper/libfishsound/src/examples%20src/lib/codecs/helper/libfishsound/src/libfishsound%20src/lib/codecs/helper/libfishsound/src/tests%20src/lib/codecs/helper/libfishsound/win32%20src/lib/codecs/helper/libfishsound/win32/libfishsound%20src/lib/codecs/speex/filters/dsfSpeexEncoder%20src/lib/codecs/theora/libs/libOOTheora%20src/lib/codecs/vorbis/filters/dsfVorbisEncoder%20src/lib/codecs/vorbis/libs/libvorbis/win32/Vorbis_Dynamic_Debug%20src'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list