removed smpeg support completely.
authorOzkan Sezer <sezeroz@gmail.com>
Wed, 10 Oct 2018 17:56:10 +0300
changeset 901253f50984a9a
parent 900 b56dbe75cac8
child 903 af51b2dda16a
removed smpeg support completely.
Makefile.in
README.txt
SDL2_mixer.spec.in
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj
VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj
VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj
VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters
VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj
VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj
VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters
VisualC/SDL_mixer.vcxproj
VisualC/SDL_mixer.vcxproj.filters
Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj
Xcode/SDL_mixer.xcodeproj/project.pbxproj
acinclude/smpeg2.m4
aclocal.m4
configure
configure.in
debian/rules
music.c
music.h
music_smpeg.c
music_smpeg.h
     1.1 --- a/Makefile.in	Mon Oct 08 17:30:24 2018 +0300
     1.2 +++ b/Makefile.in	Wed Oct 10 17:56:10 2018 +0300
     1.3 @@ -38,7 +38,7 @@
     1.4  PLAYWAVE_OBJECTS = @PLAYWAVE_OBJECTS@
     1.5  PLAYMUS_OBJECTS = @PLAYMUS_OBJECTS@
     1.6  
     1.7 -DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_smpeg.c music_smpeg.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc
     1.8 +DIST = *.txt Android.mk Makefile.in SDL2_mixer.pc.in SDL2_mixer.spec.in SDL_mixer.h VisualC VisualC-WinRT Xcode Xcode-iOS acinclude aclocal.m4 autogen.sh build-scripts configure configure.in debian effect_position.c effect_stereoreverse.c effects_internal.c effects_internal.h external gcc-fat.sh load_aiff.c load_aiff.h load_voc.c load_voc.h mixer.c mixer.h music.c music.h music_cmd.c music_cmd.h music_flac.c music_flac.h music_fluidsynth.c music_fluidsynth.h music_mad.c music_mad.h music_mikmod.c music_mikmod.h music_modplug.c music_modplug.h music_mpg123.c music_mpg123.h music_nativemidi.c music_nativemidi.h music_ogg.c music_ogg.h music_timidity.c music_timidity.h music_wav.c music_wav.h native_midi playmus.c playwave.c timidity version.rc
     1.9  
    1.10  LT_AGE      = @LT_AGE@
    1.11  LT_CURRENT  = @LT_CURRENT@
     2.1 --- a/README.txt	Mon Oct 08 17:30:24 2018 +0300
     2.2 +++ b/README.txt	Wed Oct 10 17:56:10 2018 +0300
     2.3 @@ -14,7 +14,7 @@
     2.4  The mixer can currently load Microsoft WAVE files and Creative Labs VOC
     2.5  files as audio samples, it can load FLAC files with libFLAC, it can load
     2.6  Ogg Vorbis files with Ogg Vorbis or Tremor libraries, it can load MP3 files
     2.7 -using mpg123, SMPEG or libmad, and it can load MIDI files with Timidity,
     2.8 +using mpg123 or libmad, and it can load MIDI files with Timidity,
     2.9  FluidSynth, and natively on Windows, Mac OSX, and Linux, and finally it can
    2.10  load the following file formats via ModPlug or MikMod: .MOD .S3M .IT .XM.
    2.11  
     3.1 --- a/SDL2_mixer.spec.in	Mon Oct 08 17:30:24 2018 +0300
     3.2 +++ b/SDL2_mixer.spec.in	Wed Oct 10 17:56:10 2018 +0300
     3.3 @@ -16,7 +16,7 @@
     3.4  Due to popular demand, here is a simple multi-channel audio mixer.
     3.5  It supports 4 channels of 16 bit stereo audio, plus a single channel
     3.6  of music, mixed by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis,
     3.7 -Tremor, SMPEG MP3, and libmad MP3 libraries.
     3.8 +Tremor, libmpg123 and libmad MP3 libraries.
     3.9  
    3.10  %package devel
    3.11  Summary: Libraries, includes and more to develop SDL applications.
     4.1 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj	Mon Oct 08 17:30:24 2018 +0300
     4.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj	Wed Oct 10 17:56:10 2018 +0300
     4.3 @@ -44,7 +44,6 @@
     4.4      <ClCompile Include="..\..\music_nativemidi.c" />
     4.5      <ClCompile Include="..\..\music_ogg.c" />
     4.6      <ClCompile Include="..\..\music_opus.c" />
     4.7 -    <ClCompile Include="..\..\music_smpeg.c" />
     4.8      <ClCompile Include="..\..\music_timidity.c" />
     4.9      <ClCompile Include="..\..\music_wav.c" />
    4.10      <ClCompile Include="..\..\timidity\common.c" />
     5.1 --- a/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters	Mon Oct 08 17:30:24 2018 +0300
     5.2 +++ b/VisualC-WinRT/UWP_VS2015/SDL_mixer-UWP.vcxproj.filters	Wed Oct 10 17:56:10 2018 +0300
     5.3 @@ -18,7 +18,6 @@
     5.4      <ClCompile Include="..\..\music_nativemidi.c" />
     5.5      <ClCompile Include="..\..\music_ogg.c" />
     5.6      <ClCompile Include="..\..\music_opus.c" />
     5.7 -    <ClCompile Include="..\..\music_smpeg.c" />
     5.8      <ClCompile Include="..\..\music_timidity.c" />
     5.9      <ClCompile Include="..\..\music_wav.c" />
    5.10      <ClCompile Include="..\..\timidity\common.c">
     6.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj	Mon Oct 08 17:30:24 2018 +0300
     6.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj	Wed Oct 10 17:56:10 2018 +0300
     6.3 @@ -181,7 +181,6 @@
     6.4      <ClCompile Include="..\..\music_nativemidi.c" />
     6.5      <ClCompile Include="..\..\music_ogg.c" />
     6.6      <ClCompile Include="..\..\music_opus.c" />
     6.7 -    <ClCompile Include="..\..\music_smpeg.c" />
     6.8      <ClCompile Include="..\..\music_timidity.c" />
     6.9      <ClCompile Include="..\..\music_wav.c" />
    6.10      <ClCompile Include="..\..\timidity\common.c" />
    6.11 @@ -210,7 +209,6 @@
    6.12      <ClInclude Include="..\..\music_nativemidi.h" />
    6.13      <ClInclude Include="..\..\music_ogg.h" />
    6.14      <ClInclude Include="..\..\music_opus.h" />
    6.15 -    <ClInclude Include="..\..\music_smpeg.h" />
    6.16      <ClInclude Include="..\..\music_timidity.h" />
    6.17      <ClInclude Include="..\..\music_wav.h" />
    6.18      <ClInclude Include="..\..\SDL_mixer.h" />
     7.1 --- a/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters	Mon Oct 08 17:30:24 2018 +0300
     7.2 +++ b/VisualC-WinRT/WinPhone80_VS2012/SDL_mixer-WinPhone80.vcxproj.filters	Wed Oct 10 17:56:10 2018 +0300
     7.3 @@ -18,7 +18,6 @@
     7.4      <ClCompile Include="..\..\music_nativemidi.c" />
     7.5      <ClCompile Include="..\..\music_ogg.c" />
     7.6      <ClCompile Include="..\..\music_opus.c" />
     7.7 -    <ClCompile Include="..\..\music_smpeg.c" />
     7.8      <ClCompile Include="..\..\music_timidity.c" />
     7.9      <ClCompile Include="..\..\music_wav.c" />
    7.10      <ClCompile Include="..\..\timidity\common.c">
    7.11 @@ -65,7 +64,6 @@
    7.12      <ClInclude Include="..\..\music_nativemidi.h" />
    7.13      <ClInclude Include="..\..\music_ogg.h" />
    7.14      <ClInclude Include="..\..\music_opus.h" />
    7.15 -    <ClInclude Include="..\..\music_smpeg.h" />
    7.16      <ClInclude Include="..\..\music_timidity.h" />
    7.17      <ClInclude Include="..\..\music_wav.h" />
    7.18      <ClInclude Include="..\..\SDL_mixer.h" />
     8.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj	Mon Oct 08 17:30:24 2018 +0300
     8.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj	Wed Oct 10 17:56:10 2018 +0300
     8.3 @@ -50,7 +50,6 @@
     8.4      <ClCompile Include="..\..\music_nativemidi.c" />
     8.5      <ClCompile Include="..\..\music_ogg.c" />
     8.6      <ClCompile Include="..\..\music_opus.c" />
     8.7 -    <ClCompile Include="..\..\music_smpeg.c" />
     8.8      <ClCompile Include="..\..\music_timidity.c" />
     8.9      <ClCompile Include="..\..\music_wav.c" />
    8.10      <ClCompile Include="..\..\timidity\common.c" />
    8.11 @@ -79,7 +78,6 @@
    8.12      <ClInclude Include="..\..\music_nativemidi.h" />
    8.13      <ClInclude Include="..\..\music_ogg.h" />
    8.14      <ClInclude Include="..\..\music_opus.h" />
    8.15 -    <ClInclude Include="..\..\music_smpeg.h" />
    8.16      <ClInclude Include="..\..\music_timidity.h" />
    8.17      <ClInclude Include="..\..\music_wav.h" />
    8.18      <ClInclude Include="..\..\SDL_mixer.h" />
     9.1 --- a/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters	Mon Oct 08 17:30:24 2018 +0300
     9.2 +++ b/VisualC-WinRT/WinPhone81_VS2013/SDL_mixer-WinPhone81.vcxproj.filters	Wed Oct 10 17:56:10 2018 +0300
     9.3 @@ -18,7 +18,6 @@
     9.4      <ClCompile Include="..\..\music_nativemidi.c" />
     9.5      <ClCompile Include="..\..\music_ogg.c" />
     9.6      <ClCompile Include="..\..\music_opus.c" />
     9.7 -    <ClCompile Include="..\..\music_smpeg.c" />
     9.8      <ClCompile Include="..\..\music_timidity.c" />
     9.9      <ClCompile Include="..\..\music_wav.c" />
    9.10      <ClCompile Include="..\..\timidity\common.c">
    9.11 @@ -65,7 +64,6 @@
    9.12      <ClInclude Include="..\..\music_nativemidi.h" />
    9.13      <ClInclude Include="..\..\music_ogg.h" />
    9.14      <ClInclude Include="..\..\music_opus.h" />
    9.15 -    <ClInclude Include="..\..\music_smpeg.h" />
    9.16      <ClInclude Include="..\..\music_timidity.h" />
    9.17      <ClInclude Include="..\..\music_wav.h" />
    9.18      <ClInclude Include="..\..\SDL_mixer.h" />
    10.1 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj	Mon Oct 08 17:30:24 2018 +0300
    10.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj	Wed Oct 10 17:56:10 2018 +0300
    10.3 @@ -58,7 +58,6 @@
    10.4      <ClCompile Include="..\..\music_nativemidi.c" />
    10.5      <ClCompile Include="..\..\music_ogg.c" />
    10.6      <ClCompile Include="..\..\music_opus.c" />
    10.7 -    <ClCompile Include="..\..\music_smpeg.c" />
    10.8      <ClCompile Include="..\..\music_timidity.c" />
    10.9      <ClCompile Include="..\..\music_wav.c" />
   10.10      <ClCompile Include="..\..\timidity\common.c" />
   10.11 @@ -87,7 +86,6 @@
   10.12      <ClInclude Include="..\..\music_nativemidi.h" />
   10.13      <ClInclude Include="..\..\music_ogg.h" />
   10.14      <ClInclude Include="..\..\music_opus.h" />
   10.15 -    <ClInclude Include="..\..\music_smpeg.h" />
   10.16      <ClInclude Include="..\..\music_timidity.h" />
   10.17      <ClInclude Include="..\..\music_wav.h" />
   10.18      <ClInclude Include="..\..\SDL_mixer.h" />
    11.1 --- a/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters	Mon Oct 08 17:30:24 2018 +0300
    11.2 +++ b/VisualC-WinRT/WinRT80_VS2012/SDL_mixer-WinRT80.vcxproj.filters	Wed Oct 10 17:56:10 2018 +0300
    11.3 @@ -18,7 +18,6 @@
    11.4      <ClCompile Include="..\..\music_nativemidi.c" />
    11.5      <ClCompile Include="..\..\music_ogg.c" />
    11.6      <ClCompile Include="..\..\music_opus.c" />
    11.7 -    <ClCompile Include="..\..\music_smpeg.c" />
    11.8      <ClCompile Include="..\..\music_timidity.c" />
    11.9      <ClCompile Include="..\..\music_wav.c" />
   11.10      <ClCompile Include="..\..\timidity\common.c">
   11.11 @@ -65,7 +64,6 @@
   11.12      <ClInclude Include="..\..\music_nativemidi.h" />
   11.13      <ClInclude Include="..\..\music_ogg.h" />
   11.14      <ClInclude Include="..\..\music_opus.h" />
   11.15 -    <ClInclude Include="..\..\music_smpeg.h" />
   11.16      <ClInclude Include="..\..\music_timidity.h" />
   11.17      <ClInclude Include="..\..\music_wav.h" />
   11.18      <ClInclude Include="..\..\SDL_mixer.h" />
    12.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj	Mon Oct 08 17:30:24 2018 +0300
    12.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj	Wed Oct 10 17:56:10 2018 +0300
    12.3 @@ -58,7 +58,6 @@
    12.4      <ClCompile Include="..\..\music_nativemidi.c" />
    12.5      <ClCompile Include="..\..\music_ogg.c" />
    12.6      <ClCompile Include="..\..\music_opus.c" />
    12.7 -    <ClCompile Include="..\..\music_smpeg.c" />
    12.8      <ClCompile Include="..\..\music_timidity.c" />
    12.9      <ClCompile Include="..\..\music_wav.c" />
   12.10      <ClCompile Include="..\..\timidity\common.c" />
   12.11 @@ -87,7 +86,6 @@
   12.12      <ClInclude Include="..\..\music_nativemidi.h" />
   12.13      <ClInclude Include="..\..\music_ogg.h" />
   12.14      <ClInclude Include="..\..\music_opus.h" />
   12.15 -    <ClInclude Include="..\..\music_smpeg.h" />
   12.16      <ClInclude Include="..\..\music_timidity.h" />
   12.17      <ClInclude Include="..\..\music_wav.h" />
   12.18      <ClInclude Include="..\..\SDL_mixer.h" />
    13.1 --- a/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters	Mon Oct 08 17:30:24 2018 +0300
    13.2 +++ b/VisualC-WinRT/WinRT81_VS2013/SDL_mixer-WinRT81.vcxproj.filters	Wed Oct 10 17:56:10 2018 +0300
    13.3 @@ -18,7 +18,6 @@
    13.4      <ClCompile Include="..\..\music_nativemidi.c" />
    13.5      <ClCompile Include="..\..\music_ogg.c" />
    13.6      <ClCompile Include="..\..\music_opus.c" />
    13.7 -    <ClCompile Include="..\..\music_smpeg.c" />
    13.8      <ClCompile Include="..\..\music_timidity.c" />
    13.9      <ClCompile Include="..\..\music_wav.c" />
   13.10      <ClCompile Include="..\..\timidity\common.c">
   13.11 @@ -65,7 +64,6 @@
   13.12      <ClInclude Include="..\..\music_nativemidi.h" />
   13.13      <ClInclude Include="..\..\music_ogg.h" />
   13.14      <ClInclude Include="..\..\music_opus.h" />
   13.15 -    <ClInclude Include="..\..\music_smpeg.h" />
   13.16      <ClInclude Include="..\..\music_timidity.h" />
   13.17      <ClInclude Include="..\..\music_wav.h" />
   13.18      <ClInclude Include="..\..\SDL_mixer.h" />
    14.1 --- a/VisualC/SDL_mixer.vcxproj	Mon Oct 08 17:30:24 2018 +0300
    14.2 +++ b/VisualC/SDL_mixer.vcxproj	Wed Oct 10 17:56:10 2018 +0300
    14.3 @@ -209,7 +209,6 @@
    14.4      <ClInclude Include="..\music_nativemidi.h" />
    14.5      <ClInclude Include="..\music_ogg.h" />
    14.6      <ClInclude Include="..\music_opus.h" />
    14.7 -    <ClInclude Include="..\music_smpeg.h" />
    14.8      <ClInclude Include="..\music_timidity.h" />
    14.9      <ClInclude Include="..\music_wav.h" />
   14.10      <ClInclude Include="..\SDL_mixer.h" />
   14.11 @@ -474,7 +473,6 @@
   14.12      <ClCompile Include="..\music_nativemidi.c" />
   14.13      <ClCompile Include="..\music_ogg.c" />
   14.14      <ClCompile Include="..\music_opus.c" />
   14.15 -    <ClCompile Include="..\music_smpeg.c" />
   14.16      <ClCompile Include="..\music_timidity.c" />
   14.17      <ClCompile Include="..\music_wav.c" />
   14.18    </ItemGroup>
    15.1 --- a/VisualC/SDL_mixer.vcxproj.filters	Mon Oct 08 17:30:24 2018 +0300
    15.2 +++ b/VisualC/SDL_mixer.vcxproj.filters	Wed Oct 10 17:56:10 2018 +0300
    15.3 @@ -49,9 +49,6 @@
    15.4      <ClInclude Include="..\music_opus.h">
    15.5        <Filter>Sources</Filter>
    15.6      </ClInclude>
    15.7 -    <ClInclude Include="..\music_smpeg.h">
    15.8 -      <Filter>Sources</Filter>
    15.9 -    </ClInclude>
   15.10      <ClInclude Include="..\music_timidity.h">
   15.11        <Filter>Sources</Filter>
   15.12      </ClInclude>
   15.13 @@ -221,9 +218,6 @@
   15.14      <ClCompile Include="..\music_opus.c">
   15.15        <Filter>Sources</Filter>
   15.16      </ClCompile>
   15.17 -    <ClCompile Include="..\music_smpeg.c">
   15.18 -      <Filter>Sources</Filter>
   15.19 -    </ClCompile>
   15.20      <ClCompile Include="..\music_timidity.c">
   15.21        <Filter>Sources</Filter>
   15.22      </ClCompile>
    16.1 --- a/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj	Mon Oct 08 17:30:24 2018 +0300
    16.2 +++ b/Xcode-iOS/SDL_mixer.xcodeproj/project.pbxproj	Wed Oct 10 17:56:10 2018 +0300
    16.3 @@ -73,7 +73,6 @@
    16.4  		AA5314551FE0FE2E0025C9BE /* mixer.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406081F9609B900EDAF53 /* mixer.h */; };
    16.5  		AA5314561FE0FE2E0025C9BE /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406241F9609BC00EDAF53 /* music_mad.h */; };
    16.6  		AA5314571FE0FE2E0025C9BE /* music.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE4060A1F9609B900EDAF53 /* music.h */; };
    16.7 -		AA5314581FE0FE2E0025C9BE /* music_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406131F9609BA00EDAF53 /* music_smpeg.h */; };
    16.8  		AA5314591FE0FE2E0025C9BE /* options.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE883931F97325F007B6569 /* options.h */; };
    16.9  		AA53145A1FE0FE2E0025C9BE /* asm_arm.h in Headers */ = {isa = PBXBuildFile; fileRef = AA644296175B0E2500A2125A /* asm_arm.h */; };
   16.10  		AA53145B1FE0FE2E0025C9BE /* backends.h in Headers */ = {isa = PBXBuildFile; fileRef = AA644297175B0E2500A2125A /* backends.h */; };
   16.11 @@ -119,7 +118,6 @@
   16.12  		AA5314841FE0FE2E0025C9BE /* timidity.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE883941F97325F007B6569 /* timidity.c */; };
   16.13  		AA5314851FE0FE2E0025C9BE /* stream_encoder_framing.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71251F9BC91D00A6BC31 /* stream_encoder_framing.c */; };
   16.14  		AA5314861FE0FE2E0025C9BE /* music_modplug.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4060C1F9609B900EDAF53 /* music_modplug.c */; };
   16.15 -		AA5314871FE0FE2E0025C9BE /* music_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406221F9609BC00EDAF53 /* music_smpeg.c */; };
   16.16  		AA5314881FE0FE2E0025C9BE /* cpu.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71201F9BC91C00A6BC31 /* cpu.c */; };
   16.17  		AA5314891FE0FE2E0025C9BE /* load_aiff.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406061F9609B900EDAF53 /* load_aiff.c */; };
   16.18  		AA53148A1FE0FE2E0025C9BE /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = AA1C71291F9BC91D00A6BC31 /* window.c */; };
   16.19 @@ -300,7 +298,6 @@
   16.20  		AAE406301F9609BD00EDAF53 /* music_wav.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406101F9609BA00EDAF53 /* music_wav.h */; };
   16.21  		AAE406311F9609BD00EDAF53 /* music_wav.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406111F9609BA00EDAF53 /* music_wav.c */; };
   16.22  		AAE406321F9609BD00EDAF53 /* music_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406121F9609BA00EDAF53 /* music_mad.c */; };
   16.23 -		AAE406331F9609BD00EDAF53 /* music_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406131F9609BA00EDAF53 /* music_smpeg.h */; };
   16.24  		AAE406341F9609BD00EDAF53 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406141F9609BA00EDAF53 /* load_voc.c */; };
   16.25  		AAE406351F9609BD00EDAF53 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406151F9609BA00EDAF53 /* music.c */; };
   16.26  		AAE406361F9609BD00EDAF53 /* music_mikmod.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406161F9609BA00EDAF53 /* music_mikmod.h */; };
   16.27 @@ -315,7 +312,6 @@
   16.28  		AAE4063F1F9609BD00EDAF53 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE4061F1F9609BB00EDAF53 /* music_ogg.c */; };
   16.29  		AAE406401F9609BD00EDAF53 /* music_nativemidi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406201F9609BC00EDAF53 /* music_nativemidi.h */; };
   16.30  		AAE406411F9609BD00EDAF53 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406211F9609BC00EDAF53 /* music_cmd.h */; };
   16.31 -		AAE406421F9609BD00EDAF53 /* music_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406221F9609BC00EDAF53 /* music_smpeg.c */; };
   16.32  		AAE406431F9609BD00EDAF53 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406231F9609BC00EDAF53 /* music_cmd.c */; };
   16.33  		AAE406441F9609BD00EDAF53 /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE406241F9609BC00EDAF53 /* music_mad.h */; };
   16.34  		AAE406451F9609BD00EDAF53 /* music_mpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE406251F9609BC00EDAF53 /* music_mpg123.c */; };
   16.35 @@ -458,7 +454,6 @@
   16.36  		AAE406101F9609BA00EDAF53 /* music_wav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_wav.h; path = ../music_wav.h; sourceTree = "<group>"; };
   16.37  		AAE406111F9609BA00EDAF53 /* music_wav.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_wav.c; path = ../music_wav.c; sourceTree = "<group>"; };
   16.38  		AAE406121F9609BA00EDAF53 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = "<group>"; };
   16.39 -		AAE406131F9609BA00EDAF53 /* music_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_smpeg.h; path = ../music_smpeg.h; sourceTree = "<group>"; };
   16.40  		AAE406141F9609BA00EDAF53 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_voc.c; path = ../load_voc.c; sourceTree = "<group>"; };
   16.41  		AAE406151F9609BA00EDAF53 /* music.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music.c; path = ../music.c; sourceTree = "<group>"; };
   16.42  		AAE406161F9609BA00EDAF53 /* music_mikmod.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mikmod.h; path = ../music_mikmod.h; sourceTree = "<group>"; };
   16.43 @@ -473,7 +468,6 @@
   16.44  		AAE4061F1F9609BB00EDAF53 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_ogg.c; path = ../music_ogg.c; sourceTree = "<group>"; };
   16.45  		AAE406201F9609BC00EDAF53 /* music_nativemidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_nativemidi.h; path = ../music_nativemidi.h; sourceTree = "<group>"; };
   16.46  		AAE406211F9609BC00EDAF53 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_cmd.h; path = ../music_cmd.h; sourceTree = "<group>"; };
   16.47 -		AAE406221F9609BC00EDAF53 /* music_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_smpeg.c; path = ../music_smpeg.c; sourceTree = "<group>"; };
   16.48  		AAE406231F9609BC00EDAF53 /* music_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_cmd.c; path = ../music_cmd.c; sourceTree = "<group>"; };
   16.49  		AAE406241F9609BC00EDAF53 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = "<group>"; };
   16.50  		AAE406251F9609BC00EDAF53 /* music_mpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mpg123.c; path = ../music_mpg123.c; sourceTree = "<group>"; };
   16.51 @@ -587,8 +581,6 @@
   16.52  				AAE406201F9609BC00EDAF53 /* music_nativemidi.h */,
   16.53  				AAE4061F1F9609BB00EDAF53 /* music_ogg.c */,
   16.54  				AAE406171F9609BA00EDAF53 /* music_ogg.h */,
   16.55 -				AAE406221F9609BC00EDAF53 /* music_smpeg.c */,
   16.56 -				AAE406131F9609BA00EDAF53 /* music_smpeg.h */,
   16.57  				AAE4061D1F9609BB00EDAF53 /* music_timidity.c */,
   16.58  				AAE4061C1F9609BB00EDAF53 /* music_timidity.h */,
   16.59  				AAE406111F9609BA00EDAF53 /* music_wav.c */,
   16.60 @@ -761,7 +753,6 @@
   16.61  				AA5314551FE0FE2E0025C9BE /* mixer.h in Headers */,
   16.62  				AA5314561FE0FE2E0025C9BE /* music_mad.h in Headers */,
   16.63  				AA5314571FE0FE2E0025C9BE /* music.h in Headers */,
   16.64 -				AA5314581FE0FE2E0025C9BE /* music_smpeg.h in Headers */,
   16.65  				AA5314591FE0FE2E0025C9BE /* options.h in Headers */,
   16.66  				AA53145A1FE0FE2E0025C9BE /* asm_arm.h in Headers */,
   16.67  				AA53145B1FE0FE2E0025C9BE /* backends.h in Headers */,
   16.68 @@ -814,7 +805,6 @@
   16.69  				AAE406281F9609BD00EDAF53 /* mixer.h in Headers */,
   16.70  				AAE406441F9609BD00EDAF53 /* music_mad.h in Headers */,
   16.71  				AAE4062A1F9609BD00EDAF53 /* music.h in Headers */,
   16.72 -				AAE406331F9609BD00EDAF53 /* music_smpeg.h in Headers */,
   16.73  				AAE883AA1F973261007B6569 /* options.h in Headers */,
   16.74  				AA64429E175B0E2500A2125A /* asm_arm.h in Headers */,
   16.75  				AA64429F175B0E2500A2125A /* backends.h in Headers */,
   16.76 @@ -1000,7 +990,6 @@
   16.77  				AA5314841FE0FE2E0025C9BE /* timidity.c in Sources */,
   16.78  				AA5314851FE0FE2E0025C9BE /* stream_encoder_framing.c in Sources */,
   16.79  				AA5314861FE0FE2E0025C9BE /* music_modplug.c in Sources */,
   16.80 -				AA5314871FE0FE2E0025C9BE /* music_smpeg.c in Sources */,
   16.81  				AA5314881FE0FE2E0025C9BE /* cpu.c in Sources */,
   16.82  				AA5314891FE0FE2E0025C9BE /* load_aiff.c in Sources */,
   16.83  				AA53148A1FE0FE2E0025C9BE /* window.c in Sources */,
   16.84 @@ -1114,7 +1103,6 @@
   16.85  				AAE883AB1F973261007B6569 /* timidity.c in Sources */,
   16.86  				AA1C71431F9BC92000A6BC31 /* stream_encoder_framing.c in Sources */,
   16.87  				AAE4062C1F9609BD00EDAF53 /* music_modplug.c in Sources */,
   16.88 -				AAE406421F9609BD00EDAF53 /* music_smpeg.c in Sources */,
   16.89  				AA1C713E1F9BC92000A6BC31 /* cpu.c in Sources */,
   16.90  				AAE406261F9609BD00EDAF53 /* load_aiff.c in Sources */,
   16.91  				AA1C71471F9BC92000A6BC31 /* window.c in Sources */,
    17.1 --- a/Xcode/SDL_mixer.xcodeproj/project.pbxproj	Mon Oct 08 17:30:24 2018 +0300
    17.2 +++ b/Xcode/SDL_mixer.xcodeproj/project.pbxproj	Wed Oct 10 17:56:10 2018 +0300
    17.3 @@ -36,7 +36,6 @@
    17.4  		AAE405EC1F9607C300EDAF53 /* music_wav.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405C81F9607C000EDAF53 /* music_wav.h */; };
    17.5  		AAE405ED1F9607C300EDAF53 /* music_wav.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405C91F9607C000EDAF53 /* music_wav.c */; };
    17.6  		AAE405EE1F9607C300EDAF53 /* music_mad.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CA1F9607C000EDAF53 /* music_mad.c */; };
    17.7 -		AAE405EF1F9607C300EDAF53 /* music_smpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405CB1F9607C000EDAF53 /* music_smpeg.h */; };
    17.8  		AAE405F01F9607C300EDAF53 /* load_voc.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CC1F9607C000EDAF53 /* load_voc.c */; };
    17.9  		AAE405F11F9607C300EDAF53 /* music.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CD1F9607C000EDAF53 /* music.c */; };
   17.10  		AAE405F21F9607C300EDAF53 /* effects_internal.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405CE1F9607C100EDAF53 /* effects_internal.c */; };
   17.11 @@ -53,7 +52,6 @@
   17.12  		AAE405FD1F9607C300EDAF53 /* music_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405D91F9607C200EDAF53 /* music_ogg.c */; };
   17.13  		AAE405FE1F9607C300EDAF53 /* music_nativemidi.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */; };
   17.14  		AAE405FF1F9607C300EDAF53 /* music_cmd.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DB1F9607C200EDAF53 /* music_cmd.h */; };
   17.15 -		AAE406001F9607C300EDAF53 /* music_smpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DC1F9607C200EDAF53 /* music_smpeg.c */; };
   17.16  		AAE406011F9607C300EDAF53 /* music_mad.h in Headers */ = {isa = PBXBuildFile; fileRef = AAE405DD1F9607C300EDAF53 /* music_mad.h */; };
   17.17  		AAE406021F9607C300EDAF53 /* music_cmd.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DE1F9607C300EDAF53 /* music_cmd.c */; };
   17.18  		AAE406031F9607C300EDAF53 /* music_mpg123.c in Sources */ = {isa = PBXBuildFile; fileRef = AAE405DF1F9607C300EDAF53 /* music_mpg123.c */; };
   17.19 @@ -140,7 +138,6 @@
   17.20  		AAE405C81F9607C000EDAF53 /* music_wav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_wav.h; path = ../music_wav.h; sourceTree = "<group>"; };
   17.21  		AAE405C91F9607C000EDAF53 /* music_wav.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_wav.c; path = ../music_wav.c; sourceTree = "<group>"; };
   17.22  		AAE405CA1F9607C000EDAF53 /* music_mad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mad.c; path = ../music_mad.c; sourceTree = "<group>"; };
   17.23 -		AAE405CB1F9607C000EDAF53 /* music_smpeg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_smpeg.h; path = ../music_smpeg.h; sourceTree = "<group>"; };
   17.24  		AAE405CC1F9607C000EDAF53 /* load_voc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load_voc.c; path = ../load_voc.c; sourceTree = "<group>"; };
   17.25  		AAE405CD1F9607C000EDAF53 /* music.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music.c; path = ../music.c; sourceTree = "<group>"; };
   17.26  		AAE405CE1F9607C100EDAF53 /* effects_internal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = effects_internal.c; path = ../effects_internal.c; sourceTree = "<group>"; };
   17.27 @@ -157,7 +154,6 @@
   17.28  		AAE405D91F9607C200EDAF53 /* music_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_ogg.c; path = ../music_ogg.c; sourceTree = "<group>"; };
   17.29  		AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_nativemidi.h; path = ../music_nativemidi.h; sourceTree = "<group>"; };
   17.30  		AAE405DB1F9607C200EDAF53 /* music_cmd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_cmd.h; path = ../music_cmd.h; sourceTree = "<group>"; };
   17.31 -		AAE405DC1F9607C200EDAF53 /* music_smpeg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_smpeg.c; path = ../music_smpeg.c; sourceTree = "<group>"; };
   17.32  		AAE405DD1F9607C300EDAF53 /* music_mad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = music_mad.h; path = ../music_mad.h; sourceTree = "<group>"; };
   17.33  		AAE405DE1F9607C300EDAF53 /* music_cmd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_cmd.c; path = ../music_cmd.c; sourceTree = "<group>"; };
   17.34  		AAE405DF1F9607C300EDAF53 /* music_mpg123.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = music_mpg123.c; path = ../music_mpg123.c; sourceTree = "<group>"; };
   17.35 @@ -291,8 +287,6 @@
   17.36  				AAE405DA1F9607C200EDAF53 /* music_nativemidi.h */,
   17.37  				AAE405D91F9607C200EDAF53 /* music_ogg.c */,
   17.38  				AAE405D11F9607C100EDAF53 /* music_ogg.h */,
   17.39 -				AAE405DC1F9607C200EDAF53 /* music_smpeg.c */,
   17.40 -				AAE405CB1F9607C000EDAF53 /* music_smpeg.h */,
   17.41  				AAE405D71F9607C200EDAF53 /* music_timidity.c */,
   17.42  				AAE405D61F9607C100EDAF53 /* music_timidity.h */,
   17.43  				AAE405C91F9607C000EDAF53 /* music_wav.c */,
   17.44 @@ -392,7 +386,6 @@
   17.45  			buildActionMask = 2147483647;
   17.46  			files = (
   17.47  				AAE405E31F9607C300EDAF53 /* music_fluidsynth.h in Headers */,
   17.48 -				AAE405EF1F9607C300EDAF53 /* music_smpeg.h in Headers */,
   17.49  				AAE405F31F9607C300EDAF53 /* music_mikmod.h in Headers */,
   17.50  				AAE883781F97321E007B6569 /* playmidi.h in Headers */,
   17.51  				AAE883771F97321E007B6569 /* timidity.h in Headers */,
   17.52 @@ -594,7 +587,6 @@
   17.53  			files = (
   17.54  				AAE8838B1F97321E007B6569 /* mix.c in Sources */,
   17.55  				AAE405E21F9607C300EDAF53 /* load_aiff.c in Sources */,
   17.56 -				AAE406001F9607C300EDAF53 /* music_smpeg.c in Sources */,
   17.57  				AAE883891F97321E007B6569 /* tables.c in Sources */,
   17.58  				AAE8837D1F97321E007B6569 /* timidity.c in Sources */,
   17.59  				AAE883791F97321E007B6569 /* resample.c in Sources */,
    18.1 --- a/acinclude/smpeg2.m4	Mon Oct 08 17:30:24 2018 +0300
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,176 +0,0 @@
    18.4 -# Configure paths for SMPEG
    18.5 -# Nicolas Vignal 11/19/2000
    18.6 -# stolen from Sam Lantinga
    18.7 -# stolen from Manish Singh
    18.8 -# stolen back from Frank Belew
    18.9 -# stolen from Manish Singh
   18.10 -# Shamelessly stolen from Owen Taylor
   18.11 -
   18.12 -dnl AM_PATH_SMPEG2([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
   18.13 -dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
   18.14 -dnl
   18.15 -AC_DEFUN([AM_PATH_SMPEG2],
   18.16 -[dnl
   18.17 -dnl Get the cflags and libraries from the smpeg2-config script
   18.18 -dnl
   18.19 -AC_ARG_WITH([smpeg-prefix],
   18.20 -            AS_HELP_STRING([--with-smpeg-prefix=PFX],
   18.21 -                           [Prefix where SMPEG is installed (optional)]),
   18.22 -            [smpeg_prefix="$withval"], [smpeg_prefix=""])
   18.23 -AC_ARG_WITH([smpeg-exec-prefix],
   18.24 -            AS_HELP_STRING([--with-smpeg-exec-prefix=PFX],
   18.25 -                           [Exec prefix where SMPEG is installed (optional)]),
   18.26 -            [smpeg_exec_prefix="$withval"], [smpeg_exec_prefix=""])
   18.27 -AC_ARG_ENABLE([smpegtest],
   18.28 -              AS_HELP_STRING([--disable-smpegtest],
   18.29 -                             [Do not try to compile and run a test SMPEG program]),
   18.30 -              [], [enable_smpegtest=yes])
   18.31 -
   18.32 -  if test x$smpeg_exec_prefix != x ; then
   18.33 -     smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix"
   18.34 -     if test x${SMPEG_CONFIG+set} != xset ; then
   18.35 -        SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg2-config
   18.36 -     fi
   18.37 -  fi
   18.38 -  if test x$smpeg_prefix != x ; then
   18.39 -     smpeg_args="$smpeg_args --prefix=$smpeg_prefix"
   18.40 -     if test x${SMPEG_CONFIG+set} != xset ; then
   18.41 -        SMPEG_CONFIG=$smpeg_prefix/bin/smpeg2-config
   18.42 -     fi
   18.43 -  fi
   18.44 -
   18.45 -  AC_PATH_PROG([SMPEG_CONFIG], [smpeg2-config], [no])
   18.46 -  min_smpeg_version=ifelse([$1], [], [2.0.0], [$1])
   18.47 -  AC_MSG_CHECKING([for SMPEG - version >= $min_smpeg_version])
   18.48 -  no_smpeg=""
   18.49 -  if test "$SMPEG_CONFIG" = "no" ; then
   18.50 -    no_smpeg=yes
   18.51 -  else
   18.52 -    SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags`
   18.53 -    SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs`
   18.54 -
   18.55 -    smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \
   18.56 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
   18.57 -    smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \
   18.58 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
   18.59 -    smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \
   18.60 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
   18.61 -    if test "x$enable_smpegtest" = "xyes" ; then
   18.62 -      ac_save_CFLAGS="$CFLAGS"
   18.63 -      ac_save_LIBS="$LIBS"
   18.64 -      CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
   18.65 -      LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
   18.66 -dnl
   18.67 -dnl Now check if the installed SMPEG is sufficiently new. (Also sanity
   18.68 -dnl checks the results of smpeg2-config to some extent
   18.69 -dnl
   18.70 -      rm -f conf.smpegtest
   18.71 -      AC_RUN_IFELSE([AC_LANG_SOURCE([[
   18.72 -#include <stdio.h>
   18.73 -#include <stdlib.h>
   18.74 -#include <string.h>
   18.75 -#include "smpeg.h"
   18.76 -
   18.77 -char*
   18.78 -my_strdup (char *str)
   18.79 -{
   18.80 -  char *new_str;
   18.81 -
   18.82 -  if (str)
   18.83 -    {
   18.84 -      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
   18.85 -      strcpy (new_str, str);
   18.86 -    }
   18.87 -  else
   18.88 -    new_str = NULL;
   18.89 -
   18.90 -  return new_str;
   18.91 -}
   18.92 -
   18.93 -int main (int argc, char *argv[])
   18.94 -{
   18.95 -  int major, minor, micro;
   18.96 -  char *tmp_version;
   18.97 -
   18.98 -  /* This hangs on some systems (?)
   18.99 -  system ("touch conf.smpegtest");
  18.100 -  */
  18.101 -  { FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); }
  18.102 -
  18.103 -  /* HP/UX 9 (%@#!) writes to sscanf strings */
  18.104 -  tmp_version = my_strdup("$min_smpeg_version");
  18.105 -  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
  18.106 -     printf("%s, bad version string\n", "$min_smpeg_version");
  18.107 -     exit(1);
  18.108 -   }
  18.109 -
  18.110 -   if (($smpeg_major_version > major) ||
  18.111 -      (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) ||
  18.112 -      (($smpeg_major_version == major) && ($smpeg_minor_version == minor) && ($smpeg_micro_version >= micro)))
  18.113 -    {
  18.114 -      return 0;
  18.115 -    }
  18.116 -  else
  18.117 -    {
  18.118 -      printf("\n*** 'smpeg2-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
  18.119 -      printf("*** of SMPEG required is %d.%d.%d. If smpeg2-config is correct, then it is\n", major, minor, micro);
  18.120 -      printf("*** best to upgrade to the required version.\n");
  18.121 -      printf("*** If smpeg2-config was wrong, set the environment variable SMPEG_CONFIG\n");
  18.122 -      printf("*** to point to the correct copy of smpeg2-config, and remove the file\n");
  18.123 -      printf("*** config.cache before re-running configure\n");
  18.124 -      return 1;
  18.125 -    }
  18.126 -}
  18.127 -
  18.128 -]])],[],[no_smpeg=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
  18.129 -       CFLAGS="$ac_save_CFLAGS"
  18.130 -       LIBS="$ac_save_LIBS"
  18.131 -     fi
  18.132 -  fi
  18.133 -  if test "x$no_smpeg" = x ; then
  18.134 -     AC_MSG_RESULT([yes])
  18.135 -     ifelse([$2], [], [:], [$2])
  18.136 -  else
  18.137 -     AC_MSG_RESULT([no])
  18.138 -     if test "$SMPEG_CONFIG" = "no" ; then
  18.139 -       echo "*** The smpeg2-config script installed by SMPEG could not be found"
  18.140 -       echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in"
  18.141 -       echo "*** your path, or set the SMPEG_CONFIG environment variable to the"
  18.142 -       echo "*** full path to smpeg2-config."
  18.143 -     else
  18.144 -       if test -f conf.smpegtest ; then
  18.145 -        :
  18.146 -       else
  18.147 -          echo "*** Could not run SMPEG test program, checking why..."
  18.148 -          CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
  18.149 -          LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
  18.150 -          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
  18.151 -#include <stdio.h>
  18.152 -#include "smpeg.h"
  18.153 -]],
  18.154 -        [[ return 0; ]])],
  18.155 -        [ echo "*** The test program compiled, but did not run. This usually means"
  18.156 -          echo "*** that the run-time linker is not finding SMPEG or finding the wrong"
  18.157 -          echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your"
  18.158 -          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
  18.159 -          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
  18.160 -          echo "*** is required on your system"
  18.161 -          echo "***"
  18.162 -          echo "*** If you have an old version installed, it is best to remove it, although"
  18.163 -          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
  18.164 -        [ echo "*** The test program failed to compile or link. See the file config.log for the"
  18.165 -          echo "*** exact error that occured. This usually means SMPEG was incorrectly installed"
  18.166 -          echo "*** or that you have moved SMPEG since it was installed. In the latter case, you"
  18.167 -          echo "*** may want to edit the smpeg2-config script: $SMPEG_CONFIG" ])
  18.168 -          CFLAGS="$ac_save_CFLAGS"
  18.169 -          LIBS="$ac_save_LIBS"
  18.170 -       fi
  18.171 -     fi
  18.172 -     SMPEG_CFLAGS=""
  18.173 -     SMPEG_LIBS=""
  18.174 -     ifelse([$3], [], [:], [$3])
  18.175 -  fi
  18.176 -  AC_SUBST([SMPEG_CFLAGS])
  18.177 -  AC_SUBST([SMPEG_LIBS])
  18.178 -  rm -f conf.smpegtest
  18.179 -])
    19.1 --- a/aclocal.m4	Mon Oct 08 17:30:24 2018 +0300
    19.2 +++ b/aclocal.m4	Wed Oct 10 17:56:10 2018 +0300
    19.3 @@ -8178,526 +8178,6 @@
    19.4  dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
    19.5  
    19.6  ##############################################################################
    19.7 -# Helper functions for option handling.                    -*- Autoconf -*-
    19.8 -#
    19.9 -#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
   19.10 -#   Written by Gary V. Vaughan, 2004
   19.11 -#
   19.12 -# This file is free software; the Free Software Foundation gives
   19.13 -# unlimited permission to copy and/or distribute it, with or without
   19.14 -# modifications, as long as this notice is preserved.
   19.15 -
   19.16 -# serial 6 ltoptions.m4
   19.17 -
   19.18 -# This is to help aclocal find these macros, as it can't see m4_define.
   19.19 -AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
   19.20 -
   19.21 -
   19.22 -# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
   19.23 -# ------------------------------------------
   19.24 -m4_define([_LT_MANGLE_OPTION],
   19.25 -[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
   19.26 -
   19.27 -
   19.28 -# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
   19.29 -# ---------------------------------------
   19.30 -# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
   19.31 -# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
   19.32 -# saved as a flag.
   19.33 -m4_define([_LT_SET_OPTION],
   19.34 -[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
   19.35 -m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
   19.36 -        _LT_MANGLE_DEFUN([$1], [$2]),
   19.37 -    [m4_warning([Unknown $1 option `$2'])])[]dnl
   19.38 -])
   19.39 -
   19.40 -
   19.41 -# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
   19.42 -# ------------------------------------------------------------
   19.43 -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
   19.44 -m4_define([_LT_IF_OPTION],
   19.45 -[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
   19.46 -
   19.47 -
   19.48 -# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
   19.49 -# -------------------------------------------------------
   19.50 -# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
   19.51 -# are set.
   19.52 -m4_define([_LT_UNLESS_OPTIONS],
   19.53 -[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
   19.54 -	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
   19.55 -		      [m4_define([$0_found])])])[]dnl
   19.56 -m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
   19.57 -])[]dnl
   19.58 -])
   19.59 -
   19.60 -
   19.61 -# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
   19.62 -# ----------------------------------------
   19.63 -# OPTION-LIST is a space-separated list of Libtool options associated
   19.64 -# with MACRO-NAME.  If any OPTION has a matching handler declared with
   19.65 -# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
   19.66 -# the unknown option and exit.
   19.67 -m4_defun([_LT_SET_OPTIONS],
   19.68 -[# Set options
   19.69 -m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
   19.70 -    [_LT_SET_OPTION([$1], _LT_Option)])
   19.71 -
   19.72 -m4_if([$1],[LT_INIT],[
   19.73 -  dnl
   19.74 -  dnl Simply set some default values (i.e off) if boolean options were not
   19.75 -  dnl specified:
   19.76 -  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
   19.77 -  ])
   19.78 -  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
   19.79 -  ])
   19.80 -  dnl
   19.81 -  dnl If no reference was made to various pairs of opposing options, then
   19.82 -  dnl we run the default mode handler for the pair.  For example, if neither
   19.83 -  dnl `shared' nor `disable-shared' was passed, we enable building of shared
   19.84 -  dnl archives by default:
   19.85 -  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
   19.86 -  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
   19.87 -  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
   19.88 -  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
   19.89 -  		   [_LT_ENABLE_FAST_INSTALL])
   19.90 -  ])
   19.91 -])# _LT_SET_OPTIONS
   19.92 -
   19.93 -
   19.94 -## --------------------------------- ##
   19.95 -## Macros to handle LT_INIT options. ##
   19.96 -## --------------------------------- ##
   19.97 -
   19.98 -# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
   19.99 -# -----------------------------------------
  19.100 -m4_define([_LT_MANGLE_DEFUN],
  19.101 -[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
  19.102 -
  19.103 -
  19.104 -# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
  19.105 -# -----------------------------------------------
  19.106 -m4_define([LT_OPTION_DEFINE],
  19.107 -[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
  19.108 -])# LT_OPTION_DEFINE
  19.109 -
  19.110 -
  19.111 -# dlopen
  19.112 -# ------
  19.113 -LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
  19.114 -])
  19.115 -
  19.116 -AU_DEFUN([AC_LIBTOOL_DLOPEN],
  19.117 -[_LT_SET_OPTION([LT_INIT], [dlopen])
  19.118 -AC_DIAGNOSE([obsolete],
  19.119 -[$0: Remove this warning and the call to _LT_SET_OPTION when you
  19.120 -put the `dlopen' option into LT_INIT's first parameter.])
  19.121 -])
  19.122 -
  19.123 -dnl aclocal-1.4 backwards compatibility:
  19.124 -dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
  19.125 -
  19.126 -
  19.127 -# win32-dll
  19.128 -# ---------
  19.129 -# Declare package support for building win32 dll's.
  19.130 -LT_OPTION_DEFINE([LT_INIT], [win32-dll],
  19.131 -[enable_win32_dll=yes
  19.132 -
  19.133 -case $host in
  19.134 -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
  19.135 -  AC_CHECK_TOOL(AS, as, false)
  19.136 -  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  19.137 -  AC_CHECK_TOOL(OBJDUMP, objdump, false)
  19.138 -  ;;
  19.139 -esac
  19.140 -
  19.141 -test -z "$AS" && AS=as
  19.142 -_LT_DECL([], [AS],      [0], [Assembler program])dnl
  19.143 -
  19.144 -test -z "$DLLTOOL" && DLLTOOL=dlltool
  19.145 -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
  19.146 -
  19.147 -test -z "$OBJDUMP" && OBJDUMP=objdump
  19.148 -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
  19.149 -])# win32-dll
  19.150 -
  19.151 -AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
  19.152 -[AC_REQUIRE([AC_CANONICAL_HOST])dnl
  19.153 -_LT_SET_OPTION([LT_INIT], [win32-dll])
  19.154 -AC_DIAGNOSE([obsolete],
  19.155 -[$0: Remove this warning and the call to _LT_SET_OPTION when you
  19.156 -put the `win32-dll' option into LT_INIT's first parameter.])
  19.157 -])
  19.158 -
  19.159 -dnl aclocal-1.4 backwards compatibility:
  19.160 -dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
  19.161 -
  19.162 -
  19.163 -# _LT_ENABLE_SHARED([DEFAULT])
  19.164 -# ----------------------------
  19.165 -# implement the --enable-shared flag, and supports the `shared' and
  19.166 -# `disable-shared' LT_INIT options.
  19.167 -# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
  19.168 -m4_define([_LT_ENABLE_SHARED],
  19.169 -[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
  19.170 -AC_ARG_ENABLE([shared],
  19.171 -    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
  19.172 -	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
  19.173 -    [p=${PACKAGE-default}
  19.174 -    case $enableval in
  19.175 -    yes) enable_shared=yes ;;
  19.176 -    no) enable_shared=no ;;
  19.177 -    *)
  19.178 -      enable_shared=no
  19.179 -      # Look at the argument we got.  We use all the common list separators.
  19.180 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  19.181 -      for pkg in $enableval; do
  19.182 -	IFS="$lt_save_ifs"
  19.183 -	if test "X$pkg" = "X$p"; then
  19.184 -	  enable_shared=yes
  19.185 -	fi
  19.186 -      done
  19.187 -      IFS="$lt_save_ifs"
  19.188 -      ;;
  19.189 -    esac],
  19.190 -    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
  19.191 -
  19.192 -    _LT_DECL([build_libtool_libs], [enable_shared], [0],
  19.193 -	[Whether or not to build shared libraries])
  19.194 -])# _LT_ENABLE_SHARED
  19.195 -
  19.196 -LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
  19.197 -LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
  19.198 -
  19.199 -# Old names:
  19.200 -AC_DEFUN([AC_ENABLE_SHARED],
  19.201 -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
  19.202 -])
  19.203 -
  19.204 -AC_DEFUN([AC_DISABLE_SHARED],
  19.205 -[_LT_SET_OPTION([LT_INIT], [disable-shared])
  19.206 -])
  19.207 -
  19.208 -AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
  19.209 -AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
  19.210 -
  19.211 -dnl aclocal-1.4 backwards compatibility:
  19.212 -dnl AC_DEFUN([AM_ENABLE_SHARED], [])
  19.213 -dnl AC_DEFUN([AM_DISABLE_SHARED], [])
  19.214 -
  19.215 -
  19.216 -
  19.217 -# _LT_ENABLE_STATIC([DEFAULT])
  19.218 -# ----------------------------
  19.219 -# implement the --enable-static flag, and support the `static' and
  19.220 -# `disable-static' LT_INIT options.
  19.221 -# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
  19.222 -m4_define([_LT_ENABLE_STATIC],
  19.223 -[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
  19.224 -AC_ARG_ENABLE([static],
  19.225 -    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
  19.226 -	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
  19.227 -    [p=${PACKAGE-default}
  19.228 -    case $enableval in
  19.229 -    yes) enable_static=yes ;;
  19.230 -    no) enable_static=no ;;
  19.231 -    *)
  19.232 -     enable_static=no
  19.233 -      # Look at the argument we got.  We use all the common list separators.
  19.234 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  19.235 -      for pkg in $enableval; do
  19.236 -	IFS="$lt_save_ifs"
  19.237 -	if test "X$pkg" = "X$p"; then
  19.238 -	  enable_static=yes
  19.239 -	fi
  19.240 -      done
  19.241 -      IFS="$lt_save_ifs"
  19.242 -      ;;
  19.243 -    esac],
  19.244 -    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
  19.245 -
  19.246 -    _LT_DECL([build_old_libs], [enable_static], [0],
  19.247 -	[Whether or not to build static libraries])
  19.248 -])# _LT_ENABLE_STATIC
  19.249 -
  19.250 -LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
  19.251 -LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
  19.252 -
  19.253 -# Old names:
  19.254 -AC_DEFUN([AC_ENABLE_STATIC],
  19.255 -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
  19.256 -])
  19.257 -
  19.258 -AC_DEFUN([AC_DISABLE_STATIC],
  19.259 -[_LT_SET_OPTION([LT_INIT], [disable-static])
  19.260 -])
  19.261 -
  19.262 -AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
  19.263 -AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
  19.264 -
  19.265 -dnl aclocal-1.4 backwards compatibility:
  19.266 -dnl AC_DEFUN([AM_ENABLE_STATIC], [])
  19.267 -dnl AC_DEFUN([AM_DISABLE_STATIC], [])
  19.268 -
  19.269 -
  19.270 -
  19.271 -# _LT_ENABLE_FAST_INSTALL([DEFAULT])
  19.272 -# ----------------------------------
  19.273 -# implement the --enable-fast-install flag, and support the `fast-install'
  19.274 -# and `disable-fast-install' LT_INIT options.
  19.275 -# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
  19.276 -m4_define([_LT_ENABLE_FAST_INSTALL],
  19.277 -[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
  19.278 -AC_ARG_ENABLE([fast-install],
  19.279 -    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
  19.280 -    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
  19.281 -    [p=${PACKAGE-default}
  19.282 -    case $enableval in
  19.283 -    yes) enable_fast_install=yes ;;
  19.284 -    no) enable_fast_install=no ;;
  19.285 -    *)
  19.286 -      enable_fast_install=no
  19.287 -      # Look at the argument we got.  We use all the common list separators.
  19.288 -      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  19.289 -      for pkg in $enableval; do
  19.290 -	IFS="$lt_save_ifs"
  19.291 -	if test "X$pkg" = "X$p"; then
  19.292 -	  enable_fast_install=yes
  19.293 -	fi
  19.294 -      done
  19.295 -      IFS="$lt_save_ifs"
  19.296 -      ;;
  19.297 -    esac],
  19.298 -    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
  19.299 -
  19.300 -_LT_DECL([fast_install], [enable_fast_install], [0],
  19.301 -	 [Whether or not to optimize for fast installation])dnl
  19.302 -])# _LT_ENABLE_FAST_INSTALL
  19.303 -
  19.304 -LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
  19.305 -LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
  19.306 -
  19.307 -# Old names:
  19.308 -AU_DEFUN([AC_ENABLE_FAST_INSTALL],
  19.309 -[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
  19.310 -AC_DIAGNOSE([obsolete],
  19.311 -[$0: Remove this warning and the call to _LT_SET_OPTION when you put
  19.312 -the `fast-install' option into LT_INIT's first parameter.])
  19.313 -])
  19.314 -
  19.315 -AU_DEFUN([AC_DISABLE_FAST_INSTALL],
  19.316 -[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
  19.317 -AC_DIAGNOSE([obsolete],
  19.318 -[$0: Remove this warning and the call to _LT_SET_OPTION when you put
  19.319 -the `disable-fast-install' option into LT_INIT's first parameter.])
  19.320 -])
  19.321 -
  19.322 -dnl aclocal-1.4 backwards compatibility:
  19.323 -dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
  19.324 -dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
  19.325 -
  19.326 -
  19.327 -# _LT_WITH_PIC([MODE])
  19.328 -# --------------------
  19.329 -# implement the --with-pic flag, and support the `pic-only' and `no-pic'
  19.330 -# LT_INIT options.
  19.331 -# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
  19.332 -m4_define([_LT_WITH_PIC],
  19.333 -[AC_ARG_WITH([pic],
  19.334 -    [AS_HELP_STRING([--with-pic],
  19.335 -	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
  19.336 -    [pic_mode="$withval"],
  19.337 -    [pic_mode=default])
  19.338 -
  19.339 -test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
  19.340 -
  19.341 -_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
  19.342 -])# _LT_WITH_PIC
  19.343 -
  19.344 -LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
  19.345 -LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
  19.346 -
  19.347 -# Old name:
  19.348 -AU_DEFUN([AC_LIBTOOL_PICMODE],
  19.349 -[_LT_SET_OPTION([LT_INIT], [pic-only])
  19.350 -AC_DIAGNOSE([obsolete],
  19.351 -[$0: Remove this warning and the call to _LT_SET_OPTION when you
  19.352 -put the `pic-only' option into LT_INIT's first parameter.])
  19.353 -])
  19.354 -
  19.355 -dnl aclocal-1.4 backwards compatibility:
  19.356 -dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
  19.357 -
  19.358 -## ----------------- ##
  19.359 -## LTDL_INIT Options ##
  19.360 -## ----------------- ##
  19.361 -
  19.362 -m4_define([_LTDL_MODE], [])
  19.363 -LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
  19.364 -		 [m4_define([_LTDL_MODE], [nonrecursive])])
  19.365 -LT_OPTION_DEFINE([LTDL_INIT], [recursive],
  19.366 -		 [m4_define([_LTDL_MODE], [recursive])])
  19.367 -LT_OPTION_DEFINE([LTDL_INIT], [subproject],
  19.368 -		 [m4_define([_LTDL_MODE], [subproject])])
  19.369 -
  19.370 -m4_define([_LTDL_TYPE], [])
  19.371 -LT_OPTION_DEFINE([LTDL_INIT], [installable],
  19.372 -		 [m4_define([_LTDL_TYPE], [installable])])
  19.373 -LT_OPTION_DEFINE([LTDL_INIT], [convenience],
  19.374 -		 [m4_define([_LTDL_TYPE], [convenience])])
  19.375 -
  19.376 -##############################################################################
  19.377 -# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
  19.378 -#
  19.379 -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  19.380 -# Written by Gary V. Vaughan, 2004
  19.381 -#
  19.382 -# This file is free software; the Free Software Foundation gives
  19.383 -# unlimited permission to copy and/or distribute it, with or without
  19.384 -# modifications, as long as this notice is preserved.
  19.385 -
  19.386 -# serial 6 ltsugar.m4
  19.387 -
  19.388 -# This is to help aclocal find these macros, as it can't see m4_define.
  19.389 -AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
  19.390 -
  19.391 -
  19.392 -# lt_join(SEP, ARG1, [ARG2...])
  19.393 -# -----------------------------
  19.394 -# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
  19.395 -# associated separator.
  19.396 -# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
  19.397 -# versions in m4sugar had bugs.
  19.398 -m4_define([lt_join],
  19.399 -[m4_if([$#], [1], [],
  19.400 -       [$#], [2], [[$2]],
  19.401 -       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
  19.402 -m4_define([_lt_join],
  19.403 -[m4_if([$#$2], [2], [],
  19.404 -       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
  19.405 -
  19.406 -
  19.407 -# lt_car(LIST)
  19.408 -# lt_cdr(LIST)
  19.409 -# ------------
  19.410 -# Manipulate m4 lists.
  19.411 -# These macros are necessary as long as will still need to support
  19.412 -# Autoconf-2.59 which quotes differently.
  19.413 -m4_define([lt_car], [[$1]])
  19.414 -m4_define([lt_cdr],
  19.415 -[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
  19.416 -       [$#], 1, [],
  19.417 -       [m4_dquote(m4_shift($@))])])
  19.418 -m4_define([lt_unquote], $1)
  19.419 -
  19.420 -
  19.421 -# lt_append(MACRO-NAME, STRING, [SEPARATOR])
  19.422 -# ------------------------------------------
  19.423 -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
  19.424 -# Note that neither SEPARATOR nor STRING are expanded; they are appended
  19.425 -# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
  19.426 -# No SEPARATOR is output if MACRO-NAME was previously undefined (different
  19.427 -# than defined and empty).
  19.428 -#
  19.429 -# This macro is needed until we can rely on Autoconf 2.62, since earlier
  19.430 -# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
  19.431 -m4_define([lt_append],
  19.432 -[m4_define([$1],
  19.433 -	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
  19.434 -
  19.435 -
  19.436 -
  19.437 -# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
  19.438 -# ----------------------------------------------------------
  19.439 -# Produce a SEP delimited list of all paired combinations of elements of
  19.440 -# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
  19.441 -# has the form PREFIXmINFIXSUFFIXn.
  19.442 -# Needed until we can rely on m4_combine added in Autoconf 2.62.
  19.443 -m4_define([lt_combine],
  19.444 -[m4_if(m4_eval([$# > 3]), [1],
  19.445 -       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
  19.446 -[[m4_foreach([_Lt_prefix], [$2],
  19.447 -	     [m4_foreach([_Lt_suffix],
  19.448 -		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
  19.449 -	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
  19.450 -
  19.451 -
  19.452 -# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
  19.453 -# -----------------------------------------------------------------------
  19.454 -# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
  19.455 -# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
  19.456 -m4_define([lt_if_append_uniq],
  19.457 -[m4_ifdef([$1],
  19.458 -	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
  19.459 -		 [lt_append([$1], [$2], [$3])$4],
  19.460 -		 [$5])],
  19.461 -	  [lt_append([$1], [$2], [$3])$4])])
  19.462 -
  19.463 -
  19.464 -# lt_dict_add(DICT, KEY, VALUE)
  19.465 -# -----------------------------
  19.466 -m4_define([lt_dict_add],
  19.467 -[m4_define([$1($2)], [$3])])
  19.468 -
  19.469 -
  19.470 -# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
  19.471 -# --------------------------------------------
  19.472 -m4_define([lt_dict_add_subkey],
  19.473 -[m4_define([$1($2:$3)], [$4])])
  19.474 -
  19.475 -
  19.476 -# lt_dict_fetch(DICT, KEY, [SUBKEY])
  19.477 -# ----------------------------------
  19.478 -m4_define([lt_dict_fetch],
  19.479 -[m4_ifval([$3],
  19.480 -	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
  19.481 -    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
  19.482 -
  19.483 -
  19.484 -# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
  19.485 -# -----------------------------------------------------------------
  19.486 -m4_define([lt_if_dict_fetch],
  19.487 -[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
  19.488 -	[$5],
  19.489 -    [$6])])
  19.490 -
  19.491 -
  19.492 -# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
  19.493 -# --------------------------------------------------------------
  19.494 -m4_define([lt_dict_filter],
  19.495 -[m4_if([$5], [], [],
  19.496 -  [lt_join(m4_quote(m4_default([$4], [[, ]])),
  19.497 -           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
  19.498 -		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
  19.499 -])
  19.500 -
  19.501 -##############################################################################
  19.502 -# ltversion.m4 -- version numbers			-*- Autoconf -*-
  19.503 -#
  19.504 -#   Copyright (C) 2004 Free Software Foundation, Inc.
  19.505 -#   Written by Scott James Remnant, 2004
  19.506 -#
  19.507 -# This file is free software; the Free Software Foundation gives
  19.508 -# unlimited permission to copy and/or distribute it, with or without
  19.509 -# modifications, as long as this notice is preserved.
  19.510 -
  19.511 -# Generated from ltversion.in.
  19.512 -
  19.513 -# serial 3012 ltversion.m4
  19.514 -# This file is part of GNU Libtool
  19.515 -
  19.516 -m4_define([LT_PACKAGE_VERSION], [2.2.6])
  19.517 -m4_define([LT_PACKAGE_REVISION], [1.3012])
  19.518 -
  19.519 -AC_DEFUN([LTVERSION_VERSION],
  19.520 -[macro_version='2.2.6'
  19.521 -macro_revision='1.3012'
  19.522 -_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
  19.523 -_LT_DECL(, macro_revision, 0)
  19.524 -])
  19.525 -
  19.526 -##############################################################################
  19.527  # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
  19.528  #
  19.529  #   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
  19.530 @@ -8790,6 +8270,526 @@
  19.531  m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
  19.532  m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
  19.533  m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
  19.534 +##############################################################################
  19.535 +# Helper functions for option handling.                    -*- Autoconf -*-
  19.536 +#
  19.537 +#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  19.538 +#   Written by Gary V. Vaughan, 2004
  19.539 +#
  19.540 +# This file is free software; the Free Software Foundation gives
  19.541 +# unlimited permission to copy and/or distribute it, with or without
  19.542 +# modifications, as long as this notice is preserved.
  19.543 +
  19.544 +# serial 6 ltoptions.m4
  19.545 +
  19.546 +# This is to help aclocal find these macros, as it can't see m4_define.
  19.547 +AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
  19.548 +
  19.549 +
  19.550 +# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
  19.551 +# ------------------------------------------
  19.552 +m4_define([_LT_MANGLE_OPTION],
  19.553 +[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
  19.554 +
  19.555 +
  19.556 +# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
  19.557 +# ---------------------------------------
  19.558 +# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
  19.559 +# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
  19.560 +# saved as a flag.
  19.561 +m4_define([_LT_SET_OPTION],
  19.562 +[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
  19.563 +m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
  19.564 +        _LT_MANGLE_DEFUN([$1], [$2]),
  19.565 +    [m4_warning([Unknown $1 option `$2'])])[]dnl
  19.566 +])
  19.567 +
  19.568 +
  19.569 +# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
  19.570 +# ------------------------------------------------------------
  19.571 +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
  19.572 +m4_define([_LT_IF_OPTION],
  19.573 +[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
  19.574 +
  19.575 +
  19.576 +# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
  19.577 +# -------------------------------------------------------
  19.578 +# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
  19.579 +# are set.
  19.580 +m4_define([_LT_UNLESS_OPTIONS],
  19.581 +[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
  19.582 +	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
  19.583 +		      [m4_define([$0_found])])])[]dnl
  19.584 +m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
  19.585 +])[]dnl
  19.586 +])
  19.587 +
  19.588 +
  19.589 +# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
  19.590 +# ----------------------------------------
  19.591 +# OPTION-LIST is a space-separated list of Libtool options associated
  19.592 +# with MACRO-NAME.  If any OPTION has a matching handler declared with
  19.593 +# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
  19.594 +# the unknown option and exit.
  19.595 +m4_defun([_LT_SET_OPTIONS],
  19.596 +[# Set options
  19.597 +m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
  19.598 +    [_LT_SET_OPTION([$1], _LT_Option)])
  19.599 +
  19.600 +m4_if([$1],[LT_INIT],[
  19.601 +  dnl
  19.602 +  dnl Simply set some default values (i.e off) if boolean options were not
  19.603 +  dnl specified:
  19.604 +  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
  19.605 +  ])
  19.606 +  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
  19.607 +  ])
  19.608 +  dnl
  19.609 +  dnl If no reference was made to various pairs of opposing options, then
  19.610 +  dnl we run the default mode handler for the pair.  For example, if neither
  19.611 +  dnl `shared' nor `disable-shared' was passed, we enable building of shared
  19.612 +  dnl archives by default:
  19.613 +  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
  19.614 +  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
  19.615 +  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
  19.616 +  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
  19.617 +  		   [_LT_ENABLE_FAST_INSTALL])
  19.618 +  ])
  19.619 +])# _LT_SET_OPTIONS
  19.620 +
  19.621 +
  19.622 +## --------------------------------- ##
  19.623 +## Macros to handle LT_INIT options. ##
  19.624 +## --------------------------------- ##
  19.625 +
  19.626 +# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
  19.627 +# -----------------------------------------
  19.628 +m4_define([_LT_MANGLE_DEFUN],
  19.629 +[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
  19.630 +
  19.631 +
  19.632 +# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
  19.633 +# -----------------------------------------------
  19.634 +m4_define([LT_OPTION_DEFINE],
  19.635 +[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
  19.636 +])# LT_OPTION_DEFINE
  19.637 +
  19.638 +
  19.639 +# dlopen
  19.640 +# ------
  19.641 +LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
  19.642 +])
  19.643 +
  19.644 +AU_DEFUN([AC_LIBTOOL_DLOPEN],
  19.645 +[_LT_SET_OPTION([LT_INIT], [dlopen])
  19.646 +AC_DIAGNOSE([obsolete],
  19.647 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
  19.648 +put the `dlopen' option into LT_INIT's first parameter.])
  19.649 +])
  19.650 +
  19.651 +dnl aclocal-1.4 backwards compatibility:
  19.652 +dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
  19.653 +
  19.654 +
  19.655 +# win32-dll
  19.656 +# ---------
  19.657 +# Declare package support for building win32 dll's.
  19.658 +LT_OPTION_DEFINE([LT_INIT], [win32-dll],
  19.659 +[enable_win32_dll=yes
  19.660 +
  19.661 +case $host in
  19.662 +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
  19.663 +  AC_CHECK_TOOL(AS, as, false)
  19.664 +  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
  19.665 +  AC_CHECK_TOOL(OBJDUMP, objdump, false)
  19.666 +  ;;
  19.667 +esac
  19.668 +
  19.669 +test -z "$AS" && AS=as
  19.670 +_LT_DECL([], [AS],      [0], [Assembler program])dnl
  19.671 +
  19.672 +test -z "$DLLTOOL" && DLLTOOL=dlltool
  19.673 +_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
  19.674 +
  19.675 +test -z "$OBJDUMP" && OBJDUMP=objdump
  19.676 +_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
  19.677 +])# win32-dll
  19.678 +
  19.679 +AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
  19.680 +[AC_REQUIRE([AC_CANONICAL_HOST])dnl
  19.681 +_LT_SET_OPTION([LT_INIT], [win32-dll])
  19.682 +AC_DIAGNOSE([obsolete],
  19.683 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
  19.684 +put the `win32-dll' option into LT_INIT's first parameter.])
  19.685 +])
  19.686 +
  19.687 +dnl aclocal-1.4 backwards compatibility:
  19.688 +dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
  19.689 +
  19.690 +
  19.691 +# _LT_ENABLE_SHARED([DEFAULT])
  19.692 +# ----------------------------
  19.693 +# implement the --enable-shared flag, and supports the `shared' and
  19.694 +# `disable-shared' LT_INIT options.
  19.695 +# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
  19.696 +m4_define([_LT_ENABLE_SHARED],
  19.697 +[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
  19.698 +AC_ARG_ENABLE([shared],
  19.699 +    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
  19.700 +	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
  19.701 +    [p=${PACKAGE-default}
  19.702 +    case $enableval in
  19.703 +    yes) enable_shared=yes ;;
  19.704 +    no) enable_shared=no ;;
  19.705 +    *)
  19.706 +      enable_shared=no
  19.707 +      # Look at the argument we got.  We use all the common list separators.
  19.708 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  19.709 +      for pkg in $enableval; do
  19.710 +	IFS="$lt_save_ifs"
  19.711 +	if test "X$pkg" = "X$p"; then
  19.712 +	  enable_shared=yes
  19.713 +	fi
  19.714 +      done
  19.715 +      IFS="$lt_save_ifs"
  19.716 +      ;;
  19.717 +    esac],
  19.718 +    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
  19.719 +
  19.720 +    _LT_DECL([build_libtool_libs], [enable_shared], [0],
  19.721 +	[Whether or not to build shared libraries])
  19.722 +])# _LT_ENABLE_SHARED
  19.723 +
  19.724 +LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
  19.725 +LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
  19.726 +
  19.727 +# Old names:
  19.728 +AC_DEFUN([AC_ENABLE_SHARED],
  19.729 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
  19.730 +])
  19.731 +
  19.732 +AC_DEFUN([AC_DISABLE_SHARED],
  19.733 +[_LT_SET_OPTION([LT_INIT], [disable-shared])
  19.734 +])
  19.735 +
  19.736 +AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
  19.737 +AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
  19.738 +
  19.739 +dnl aclocal-1.4 backwards compatibility:
  19.740 +dnl AC_DEFUN([AM_ENABLE_SHARED], [])
  19.741 +dnl AC_DEFUN([AM_DISABLE_SHARED], [])
  19.742 +
  19.743 +
  19.744 +
  19.745 +# _LT_ENABLE_STATIC([DEFAULT])
  19.746 +# ----------------------------
  19.747 +# implement the --enable-static flag, and support the `static' and
  19.748 +# `disable-static' LT_INIT options.
  19.749 +# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
  19.750 +m4_define([_LT_ENABLE_STATIC],
  19.751 +[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
  19.752 +AC_ARG_ENABLE([static],
  19.753 +    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
  19.754 +	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
  19.755 +    [p=${PACKAGE-default}
  19.756 +    case $enableval in
  19.757 +    yes) enable_static=yes ;;
  19.758 +    no) enable_static=no ;;
  19.759 +    *)
  19.760 +     enable_static=no
  19.761 +      # Look at the argument we got.  We use all the common list separators.
  19.762 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  19.763 +      for pkg in $enableval; do
  19.764 +	IFS="$lt_save_ifs"
  19.765 +	if test "X$pkg" = "X$p"; then
  19.766 +	  enable_static=yes
  19.767 +	fi
  19.768 +      done
  19.769 +      IFS="$lt_save_ifs"
  19.770 +      ;;
  19.771 +    esac],
  19.772 +    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
  19.773 +
  19.774 +    _LT_DECL([build_old_libs], [enable_static], [0],
  19.775 +	[Whether or not to build static libraries])
  19.776 +])# _LT_ENABLE_STATIC
  19.777 +
  19.778 +LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
  19.779 +LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
  19.780 +
  19.781 +# Old names:
  19.782 +AC_DEFUN([AC_ENABLE_STATIC],
  19.783 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
  19.784 +])
  19.785 +
  19.786 +AC_DEFUN([AC_DISABLE_STATIC],
  19.787 +[_LT_SET_OPTION([LT_INIT], [disable-static])
  19.788 +])
  19.789 +
  19.790 +AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
  19.791 +AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
  19.792 +
  19.793 +dnl aclocal-1.4 backwards compatibility:
  19.794 +dnl AC_DEFUN([AM_ENABLE_STATIC], [])
  19.795 +dnl AC_DEFUN([AM_DISABLE_STATIC], [])
  19.796 +
  19.797 +
  19.798 +
  19.799 +# _LT_ENABLE_FAST_INSTALL([DEFAULT])
  19.800 +# ----------------------------------
  19.801 +# implement the --enable-fast-install flag, and support the `fast-install'
  19.802 +# and `disable-fast-install' LT_INIT options.
  19.803 +# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
  19.804 +m4_define([_LT_ENABLE_FAST_INSTALL],
  19.805 +[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
  19.806 +AC_ARG_ENABLE([fast-install],
  19.807 +    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
  19.808 +    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
  19.809 +    [p=${PACKAGE-default}
  19.810 +    case $enableval in
  19.811 +    yes) enable_fast_install=yes ;;
  19.812 +    no) enable_fast_install=no ;;
  19.813 +    *)
  19.814 +      enable_fast_install=no
  19.815 +      # Look at the argument we got.  We use all the common list separators.
  19.816 +      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
  19.817 +      for pkg in $enableval; do
  19.818 +	IFS="$lt_save_ifs"
  19.819 +	if test "X$pkg" = "X$p"; then
  19.820 +	  enable_fast_install=yes
  19.821 +	fi
  19.822 +      done
  19.823 +      IFS="$lt_save_ifs"
  19.824 +      ;;
  19.825 +    esac],
  19.826 +    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
  19.827 +
  19.828 +_LT_DECL([fast_install], [enable_fast_install], [0],
  19.829 +	 [Whether or not to optimize for fast installation])dnl
  19.830 +])# _LT_ENABLE_FAST_INSTALL
  19.831 +
  19.832 +LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
  19.833 +LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
  19.834 +
  19.835 +# Old names:
  19.836 +AU_DEFUN([AC_ENABLE_FAST_INSTALL],
  19.837 +[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
  19.838 +AC_DIAGNOSE([obsolete],
  19.839 +[$0: Remove this warning and the call to _LT_SET_OPTION when you put
  19.840 +the `fast-install' option into LT_INIT's first parameter.])
  19.841 +])
  19.842 +
  19.843 +AU_DEFUN([AC_DISABLE_FAST_INSTALL],
  19.844 +[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
  19.845 +AC_DIAGNOSE([obsolete],
  19.846 +[$0: Remove this warning and the call to _LT_SET_OPTION when you put
  19.847 +the `disable-fast-install' option into LT_INIT's first parameter.])
  19.848 +])
  19.849 +
  19.850 +dnl aclocal-1.4 backwards compatibility:
  19.851 +dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
  19.852 +dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
  19.853 +
  19.854 +
  19.855 +# _LT_WITH_PIC([MODE])
  19.856 +# --------------------
  19.857 +# implement the --with-pic flag, and support the `pic-only' and `no-pic'
  19.858 +# LT_INIT options.
  19.859 +# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
  19.860 +m4_define([_LT_WITH_PIC],
  19.861 +[AC_ARG_WITH([pic],
  19.862 +    [AS_HELP_STRING([--with-pic],
  19.863 +	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
  19.864 +    [pic_mode="$withval"],
  19.865 +    [pic_mode=default])
  19.866 +
  19.867 +test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
  19.868 +
  19.869 +_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
  19.870 +])# _LT_WITH_PIC
  19.871 +
  19.872 +LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
  19.873 +LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
  19.874 +
  19.875 +# Old name:
  19.876 +AU_DEFUN([AC_LIBTOOL_PICMODE],
  19.877 +[_LT_SET_OPTION([LT_INIT], [pic-only])
  19.878 +AC_DIAGNOSE([obsolete],
  19.879 +[$0: Remove this warning and the call to _LT_SET_OPTION when you
  19.880 +put the `pic-only' option into LT_INIT's first parameter.])
  19.881 +])
  19.882 +
  19.883 +dnl aclocal-1.4 backwards compatibility:
  19.884 +dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
  19.885 +
  19.886 +## ----------------- ##
  19.887 +## LTDL_INIT Options ##
  19.888 +## ----------------- ##
  19.889 +
  19.890 +m4_define([_LTDL_MODE], [])
  19.891 +LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
  19.892 +		 [m4_define([_LTDL_MODE], [nonrecursive])])
  19.893 +LT_OPTION_DEFINE([LTDL_INIT], [recursive],
  19.894 +		 [m4_define([_LTDL_MODE], [recursive])])
  19.895 +LT_OPTION_DEFINE([LTDL_INIT], [subproject],
  19.896 +		 [m4_define([_LTDL_MODE], [subproject])])
  19.897 +
  19.898 +m4_define([_LTDL_TYPE], [])
  19.899 +LT_OPTION_DEFINE([LTDL_INIT], [installable],
  19.900 +		 [m4_define([_LTDL_TYPE], [installable])])
  19.901 +LT_OPTION_DEFINE([LTDL_INIT], [convenience],
  19.902 +		 [m4_define([_LTDL_TYPE], [convenience])])
  19.903 +
  19.904 +##############################################################################
  19.905 +# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
  19.906 +#
  19.907 +# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
  19.908 +# Written by Gary V. Vaughan, 2004
  19.909 +#
  19.910 +# This file is free software; the Free Software Foundation gives
  19.911 +# unlimited permission to copy and/or distribute it, with or without
  19.912 +# modifications, as long as this notice is preserved.
  19.913 +
  19.914 +# serial 6 ltsugar.m4
  19.915 +
  19.916 +# This is to help aclocal find these macros, as it can't see m4_define.
  19.917 +AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
  19.918 +
  19.919 +
  19.920 +# lt_join(SEP, ARG1, [ARG2...])
  19.921 +# -----------------------------
  19.922 +# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
  19.923 +# associated separator.
  19.924 +# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
  19.925 +# versions in m4sugar had bugs.
  19.926 +m4_define([lt_join],
  19.927 +[m4_if([$#], [1], [],
  19.928 +       [$#], [2], [[$2]],
  19.929 +       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
  19.930 +m4_define([_lt_join],
  19.931 +[m4_if([$#$2], [2], [],
  19.932 +       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
  19.933 +
  19.934 +
  19.935 +# lt_car(LIST)
  19.936 +# lt_cdr(LIST)
  19.937 +# ------------
  19.938 +# Manipulate m4 lists.
  19.939 +# These macros are necessary as long as will still need to support
  19.940 +# Autoconf-2.59 which quotes differently.
  19.941 +m4_define([lt_car], [[$1]])
  19.942 +m4_define([lt_cdr],
  19.943 +[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
  19.944 +       [$#], 1, [],
  19.945 +       [m4_dquote(m4_shift($@))])])
  19.946 +m4_define([lt_unquote], $1)
  19.947 +
  19.948 +
  19.949 +# lt_append(MACRO-NAME, STRING, [SEPARATOR])
  19.950 +# ------------------------------------------
  19.951 +# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
  19.952 +# Note that neither SEPARATOR nor STRING are expanded; they are appended
  19.953 +# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
  19.954 +# No SEPARATOR is output if MACRO-NAME was previously undefined (different
  19.955 +# than defined and empty).
  19.956 +#
  19.957 +# This macro is needed until we can rely on Autoconf 2.62, since earlier
  19.958 +# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
  19.959 +m4_define([lt_append],
  19.960 +[m4_define([$1],
  19.961 +	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
  19.962 +
  19.963 +
  19.964 +
  19.965 +# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
  19.966 +# ----------------------------------------------------------
  19.967 +# Produce a SEP delimited list of all paired combinations of elements of
  19.968 +# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
  19.969 +# has the form PREFIXmINFIXSUFFIXn.
  19.970 +# Needed until we can rely on m4_combine added in Autoconf 2.62.
  19.971 +m4_define([lt_combine],
  19.972 +[m4_if(m4_eval([$# > 3]), [1],
  19.973 +       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
  19.974 +[[m4_foreach([_Lt_prefix], [$2],
  19.975 +	     [m4_foreach([_Lt_suffix],
  19.976 +		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
  19.977 +	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
  19.978 +
  19.979 +
  19.980 +# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
  19.981 +# -----------------------------------------------------------------------
  19.982 +# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
  19.983 +# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
  19.984 +m4_define([lt_if_append_uniq],
  19.985 +[m4_ifdef([$1],
  19.986 +	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
  19.987 +		 [lt_append([$1], [$2], [$3])$4],
  19.988 +		 [$5])],
  19.989 +	  [lt_append([$1], [$2], [$3])$4])])
  19.990 +
  19.991 +
  19.992 +# lt_dict_add(DICT, KEY, VALUE)
  19.993 +# -----------------------------
  19.994 +m4_define([lt_dict_add],
  19.995 +[m4_define([$1($2)], [$3])])
  19.996 +
  19.997 +
  19.998 +# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
  19.999 +# --------------------------------------------
 19.1000 +m4_define([lt_dict_add_subkey],
 19.1001 +[m4_define([$1($2:$3)], [$4])])
 19.1002 +
 19.1003 +
 19.1004 +# lt_dict_fetch(DICT, KEY, [SUBKEY])
 19.1005 +# ----------------------------------
 19.1006 +m4_define([lt_dict_fetch],
 19.1007 +[m4_ifval([$3],
 19.1008 +	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
 19.1009 +    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
 19.1010 +
 19.1011 +
 19.1012 +# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
 19.1013 +# -----------------------------------------------------------------
 19.1014 +m4_define([lt_if_dict_fetch],
 19.1015 +[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
 19.1016 +	[$5],
 19.1017 +    [$6])])
 19.1018 +
 19.1019 +
 19.1020 +# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
 19.1021 +# --------------------------------------------------------------
 19.1022 +m4_define([lt_dict_filter],
 19.1023 +[m4_if([$5], [], [],
 19.1024 +  [lt_join(m4_quote(m4_default([$4], [[, ]])),
 19.1025 +           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
 19.1026 +		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
 19.1027 +])
 19.1028 +
 19.1029 +##############################################################################
 19.1030 +# ltversion.m4 -- version numbers			-*- Autoconf -*-
 19.1031 +#
 19.1032 +#   Copyright (C) 2004 Free Software Foundation, Inc.
 19.1033 +#   Written by Scott James Remnant, 2004
 19.1034 +#
 19.1035 +# This file is free software; the Free Software Foundation gives
 19.1036 +# unlimited permission to copy and/or distribute it, with or without
 19.1037 +# modifications, as long as this notice is preserved.
 19.1038 +
 19.1039 +# Generated from ltversion.in.
 19.1040 +
 19.1041 +# serial 3012 ltversion.m4
 19.1042 +# This file is part of GNU Libtool
 19.1043 +
 19.1044 +m4_define([LT_PACKAGE_VERSION], [2.2.6])
 19.1045 +m4_define([LT_PACKAGE_REVISION], [1.3012])
 19.1046 +
 19.1047 +AC_DEFUN([LTVERSION_VERSION],
 19.1048 +[macro_version='2.2.6'
 19.1049 +macro_revision='1.3012'
 19.1050 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 19.1051 +_LT_DECL(, macro_revision, 0)
 19.1052 +])
 19.1053 +
 19.1054  # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 19.1055  # 
 19.1056  # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 19.1057 @@ -9149,179 +9149,3 @@
 19.1058    AC_SUBST(SDL_LIBS)
 19.1059    rm -f conf.sdltest
 19.1060  ])
 19.1061 -# Configure paths for SMPEG
 19.1062 -# Nicolas Vignal 11/19/2000
 19.1063 -# stolen from Sam Lantinga
 19.1064 -# stolen from Manish Singh
 19.1065 -# stolen back from Frank Belew
 19.1066 -# stolen from Manish Singh
 19.1067 -# Shamelessly stolen from Owen Taylor
 19.1068 -
 19.1069 -dnl AM_PATH_SMPEG2([MINIMUM-VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
 19.1070 -dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
 19.1071 -dnl
 19.1072 -AC_DEFUN([AM_PATH_SMPEG2],
 19.1073 -[dnl
 19.1074 -dnl Get the cflags and libraries from the smpeg2-config script
 19.1075 -dnl
 19.1076 -AC_ARG_WITH([smpeg-prefix],
 19.1077 -            AS_HELP_STRING([--with-smpeg-prefix=PFX],
 19.1078 -                           [Prefix where SMPEG is installed (optional)]),
 19.1079 -            [smpeg_prefix="$withval"], [smpeg_prefix=""])
 19.1080 -AC_ARG_WITH([smpeg-exec-prefix],
 19.1081 -            AS_HELP_STRING([--with-smpeg-exec-prefix=PFX],
 19.1082 -                           [Exec prefix where SMPEG is installed (optional)]),
 19.1083 -            [smpeg_exec_prefix="$withval"], [smpeg_exec_prefix=""])
 19.1084 -AC_ARG_ENABLE([smpegtest],
 19.1085 -              AS_HELP_STRING([--disable-smpegtest],
 19.1086 -                             [Do not try to compile and run a test SMPEG program]),
 19.1087 -              [], [enable_smpegtest=yes])
 19.1088 -
 19.1089 -  if test x$smpeg_exec_prefix != x ; then
 19.1090 -     smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix"
 19.1091 -     if test x${SMPEG_CONFIG+set} != xset ; then
 19.1092 -        SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg2-config
 19.1093 -     fi
 19.1094 -  fi
 19.1095 -  if test x$smpeg_prefix != x ; then
 19.1096 -     smpeg_args="$smpeg_args --prefix=$smpeg_prefix"
 19.1097 -     if test x${SMPEG_CONFIG+set} != xset ; then
 19.1098 -        SMPEG_CONFIG=$smpeg_prefix/bin/smpeg2-config
 19.1099 -     fi
 19.1100 -  fi
 19.1101 -
 19.1102 -  AC_PATH_PROG([SMPEG_CONFIG], [smpeg2-config], [no])
 19.1103 -  min_smpeg_version=ifelse([$1], [], [2.0.0], [$1])
 19.1104 -  AC_MSG_CHECKING([for SMPEG - version >= $min_smpeg_version])
 19.1105 -  no_smpeg=""
 19.1106 -  if test "$SMPEG_CONFIG" = "no" ; then
 19.1107 -    no_smpeg=yes
 19.1108 -  else
 19.1109 -    SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags`
 19.1110 -    SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs`
 19.1111 -
 19.1112 -    smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \
 19.1113 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
 19.1114 -    smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \
 19.1115 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
 19.1116 -    smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \
 19.1117 -           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
 19.1118 -    if test "x$enable_smpegtest" = "xyes" ; then
 19.1119 -      ac_save_CFLAGS="$CFLAGS"
 19.1120 -      ac_save_LIBS="$LIBS"
 19.1121 -      CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
 19.1122 -      LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
 19.1123 -dnl
 19.1124 -dnl Now check if the installed SMPEG is sufficiently new. (Also sanity
 19.1125 -dnl checks the results of smpeg2-config to some extent
 19.1126 -dnl
 19.1127 -      rm -f conf.smpegtest
 19.1128 -      AC_RUN_IFELSE([AC_LANG_SOURCE([[
 19.1129 -#include <stdio.h>
 19.1130 -#include <stdlib.h>
 19.1131 -#include <string.h>
 19.1132 -#include "smpeg.h"
 19.1133 -
 19.1134 -char*
 19.1135 -my_strdup (char *str)
 19.1136 -{
 19.1137 -  char *new_str;
 19.1138 -
 19.1139 -  if (str)
 19.1140 -    {
 19.1141 -      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
 19.1142 -      strcpy (new_str, str);
 19.1143 -    }
 19.1144 -  else
 19.1145 -    new_str = NULL;
 19.1146 -
 19.1147 -  return new_str;
 19.1148 -}
 19.1149 -
 19.1150 -int main (int argc, char *argv[])
 19.1151 -{
 19.1152 -  int major, minor, micro;
 19.1153 -  char *tmp_version;
 19.1154 -
 19.1155 -  /* This hangs on some systems (?)
 19.1156 -  system ("touch conf.smpegtest");
 19.1157 -  */
 19.1158 -  { FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); }
 19.1159 -
 19.1160 -  /* HP/UX 9 (%@#!) writes to sscanf strings */
 19.1161 -  tmp_version = my_strdup("$min_smpeg_version");
 19.1162 -  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
 19.1163 -     printf("%s, bad version string\n", "$min_smpeg_version");
 19.1164 -     exit(1);
 19.1165 -   }
 19.1166 -
 19.1167 -   if (($smpeg_major_version > major) ||
 19.1168 -      (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) ||
 19.1169 -      (($smpeg_major_version == major) && ($smpeg_minor_version == minor) && ($smpeg_micro_version >= micro)))
 19.1170 -    {
 19.1171 -      return 0;
 19.1172 -    }
 19.1173 -  else
 19.1174 -    {
 19.1175 -      printf("\n*** 'smpeg2-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
 19.1176 -      printf("*** of SMPEG required is %d.%d.%d. If smpeg2-config is correct, then it is\n", major, minor, micro);
 19.1177 -      printf("*** best to upgrade to the required version.\n");
 19.1178 -      printf("*** If smpeg2-config was wrong, set the environment variable SMPEG_CONFIG\n");
 19.1179 -      printf("*** to point to the correct copy of smpeg2-config, and remove the file\n");
 19.1180 -      printf("*** config.cache before re-running configure\n");
 19.1181 -      return 1;
 19.1182 -    }
 19.1183 -}
 19.1184 -
 19.1185 -]])],[],[no_smpeg=yes], [echo $ac_n "cross compiling; assumed OK... $ac_c"])
 19.1186 -       CFLAGS="$ac_save_CFLAGS"
 19.1187 -       LIBS="$ac_save_LIBS"
 19.1188 -     fi
 19.1189 -  fi
 19.1190 -  if test "x$no_smpeg" = x ; then
 19.1191 -     AC_MSG_RESULT([yes])
 19.1192 -     ifelse([$2], [], [:], [$2])
 19.1193 -  else
 19.1194 -     AC_MSG_RESULT([no])
 19.1195 -     if test "$SMPEG_CONFIG" = "no" ; then
 19.1196 -       echo "*** The smpeg2-config script installed by SMPEG could not be found"
 19.1197 -       echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in"
 19.1198 -       echo "*** your path, or set the SMPEG_CONFIG environment variable to the"
 19.1199 -       echo "*** full path to smpeg2-config."
 19.1200 -     else
 19.1201 -       if test -f conf.smpegtest ; then
 19.1202 -        :
 19.1203 -       else
 19.1204 -          echo "*** Could not run SMPEG test program, checking why..."
 19.1205 -          CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
 19.1206 -          LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
 19.1207 -          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 19.1208 -#include <stdio.h>
 19.1209 -#include "smpeg.h"
 19.1210 -]],
 19.1211 -        [[ return 0; ]])],
 19.1212 -        [ echo "*** The test program compiled, but did not run. This usually means"
 19.1213 -          echo "*** that the run-time linker is not finding SMPEG or finding the wrong"
 19.1214 -          echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your"
 19.1215 -          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
 19.1216 -          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
 19.1217 -          echo "*** is required on your system"
 19.1218 -          echo "***"
 19.1219 -          echo "*** If you have an old version installed, it is best to remove it, although"
 19.1220 -          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
 19.1221 -        [ echo "*** The test program failed to compile or link. See the file config.log for the"
 19.1222 -          echo "*** exact error that occured. This usually means SMPEG was incorrectly installed"
 19.1223 -          echo "*** or that you have moved SMPEG since it was installed. In the latter case, you"
 19.1224 -          echo "*** may want to edit the smpeg2-config script: $SMPEG_CONFIG" ])
 19.1225 -          CFLAGS="$ac_save_CFLAGS"
 19.1226 -          LIBS="$ac_save_LIBS"
 19.1227 -       fi
 19.1228 -     fi
 19.1229 -     SMPEG_CFLAGS=""
 19.1230 -     SMPEG_LIBS=""
 19.1231 -     ifelse([$3], [], [:], [$3])
 19.1232 -  fi
 19.1233 -  AC_SUBST([SMPEG_CFLAGS])
 19.1234 -  AC_SUBST([SMPEG_LIBS])
 19.1235 -  rm -f conf.smpegtest
 19.1236 -])
    20.1 --- a/configure	Mon Oct 08 17:30:24 2018 +0300
    20.2 +++ b/configure	Wed Oct 10 17:56:10 2018 +0300
    20.3 @@ -783,9 +783,6 @@
    20.4  ac_aux_dir
    20.5  OPUSFILE_LIBS
    20.6  OPUSFILE_CFLAGS
    20.7 -SMPEG_LIBS
    20.8 -SMPEG_CFLAGS
    20.9 -SMPEG_CONFIG
   20.10  LIBMIKMOD_CONFIG
   20.11  MODPLUG_LIBS
   20.12  MODPLUG_CFLAGS
   20.13 @@ -915,11 +912,6 @@
   20.14  enable_music_flac
   20.15  enable_music_flac_shared
   20.16  enable_music_mp3
   20.17 -enable_music_mp3_smpeg
   20.18 -enable_music_mp3_smpeg_shared
   20.19 -with_smpeg_prefix
   20.20 -with_smpeg_exec_prefix
   20.21 -enable_smpegtest
   20.22  enable_music_mp3_mad_gpl
   20.23  enable_music_mp3_mad_gpl_dithering
   20.24  enable_music_mp3_mpg123
   20.25 @@ -1591,11 +1583,6 @@
   20.26    --enable-music-flac-shared
   20.27                            dynamically load FLAC library [[default=yes]]
   20.28    --enable-music-mp3      enable MP3 music [[default=yes]]
   20.29 -  --enable-music-mp3-smpeg
   20.30 -                          enable MP3 music via smpeg [[default=no]]
   20.31 -  --enable-music-mp3-smpeg-shared
   20.32 -                          dynamically load smpeg library [[default=yes]]
   20.33 -  --disable-smpegtest     Do not try to compile and run a test SMPEG program
   20.34    --enable-music-mp3-mad-gpl
   20.35                            enable MP3 music via libmad GPL code [[default=no]]
   20.36    --enable-music-mp3-mad-gpl-dithering
   20.37 @@ -1616,9 +1603,6 @@
   20.38    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   20.39    --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)
   20.40    --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)
   20.41 -  --with-smpeg-prefix=PFX Prefix where SMPEG is installed (optional)
   20.42 -  --with-smpeg-exec-prefix=PFX
   20.43 -                          Exec prefix where SMPEG is installed (optional)
   20.44  
   20.45  Some influential environment variables:
   20.46    CC          C compiler command
   20.47 @@ -3943,13 +3927,13 @@
   20.48  else
   20.49    lt_cv_nm_interface="BSD nm"
   20.50    echo "int some_variable = 0;" > conftest.$ac_ext
   20.51 -  (eval echo "\"\$as_me:3946: $ac_compile\"" >&5)
   20.52 +  (eval echo "\"\$as_me:3930: $ac_compile\"" >&5)
   20.53    (eval "$ac_compile" 2>conftest.err)
   20.54    cat conftest.err >&5
   20.55 -  (eval echo "\"\$as_me:3949: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   20.56 +  (eval echo "\"\$as_me:3933: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   20.57    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   20.58    cat conftest.err >&5
   20.59 -  (eval echo "\"\$as_me:3952: output\"" >&5)
   20.60 +  (eval echo "\"\$as_me:3936: output\"" >&5)
   20.61    cat conftest.out >&5
   20.62    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
   20.63      lt_cv_nm_interface="MS dumpbin"
   20.64 @@ -5160,7 +5144,7 @@
   20.65    ;;
   20.66  *-*-irix6*)
   20.67    # Find out which ABI we are using.
   20.68 -  echo '#line 5163 "configure"' > conftest.$ac_ext
   20.69 +  echo '#line 5147 "configure"' > conftest.$ac_ext
   20.70    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   20.71    (eval $ac_compile) 2>&5
   20.72    ac_status=$?
   20.73 @@ -6990,11 +6974,11 @@
   20.74     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   20.75     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   20.76     -e 's:$: $lt_compiler_flag:'`
   20.77 -   (eval echo "\"\$as_me:6993: $lt_compile\"" >&5)
   20.78 +   (eval echo "\"\$as_me:6977: $lt_compile\"" >&5)
   20.79     (eval "$lt_compile" 2>conftest.err)
   20.80     ac_status=$?
   20.81     cat conftest.err >&5
   20.82 -   echo "$as_me:6997: \$? = $ac_status" >&5
   20.83 +   echo "$as_me:6981: \$? = $ac_status" >&5
   20.84     if (exit $ac_status) && test -s "$ac_outfile"; then
   20.85       # The compiler can only warn and ignore the option if not recognized
   20.86       # So say no if there are warnings other than the usual output.
   20.87 @@ -7329,11 +7313,11 @@
   20.88     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   20.89     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   20.90     -e 's:$: $lt_compiler_flag:'`
   20.91 -   (eval echo "\"\$as_me:7332: $lt_compile\"" >&5)
   20.92 +   (eval echo "\"\$as_me:7316: $lt_compile\"" >&5)
   20.93     (eval "$lt_compile" 2>conftest.err)
   20.94     ac_status=$?
   20.95     cat conftest.err >&5
   20.96 -   echo "$as_me:7336: \$? = $ac_status" >&5
   20.97 +   echo "$as_me:7320: \$? = $ac_status" >&5
   20.98     if (exit $ac_status) && test -s "$ac_outfile"; then
   20.99       # The compiler can only warn and ignore the option if not recognized
  20.100       # So say no if there are warnings other than the usual output.
  20.101 @@ -7434,11 +7418,11 @@
  20.102     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  20.103     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  20.104     -e 's:$: $lt_compiler_flag:'`
  20.105 -   (eval echo "\"\$as_me:7437: $lt_compile\"" >&5)
  20.106 +   (eval echo "\"\$as_me:7421: $lt_compile\"" >&5)
  20.107     (eval "$lt_compile" 2>out/conftest.err)
  20.108     ac_status=$?
  20.109     cat out/conftest.err >&5
  20.110 -   echo "$as_me:7441: \$? = $ac_status" >&5
  20.111 +   echo "$as_me:7425: \$? = $ac_status" >&5
  20.112     if (exit $ac_status) && test -s out/conftest2.$ac_objext
  20.113     then
  20.114       # The compiler can only warn and ignore the option if not recognized
  20.115 @@ -7489,11 +7473,11 @@
  20.116     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  20.117     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  20.118     -e 's:$: $lt_compiler_flag:'`
  20.119 -   (eval echo "\"\$as_me:7492: $lt_compile\"" >&5)
  20.120 +   (eval echo "\"\$as_me:7476: $lt_compile\"" >&5)
  20.121     (eval "$lt_compile" 2>out/conftest.err)
  20.122     ac_status=$?
  20.123     cat out/conftest.err >&5
  20.124 -   echo "$as_me:7496: \$? = $ac_status" >&5
  20.125 +   echo "$as_me:7480: \$? = $ac_status" >&5
  20.126     if (exit $ac_status) && test -s out/conftest2.$ac_objext
  20.127     then
  20.128       # The compiler can only warn and ignore the option if not recognized
  20.129 @@ -9858,7 +9842,7 @@
  20.130    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  20.131    lt_status=$lt_dlunknown
  20.132    cat > conftest.$ac_ext <<_LT_EOF
  20.133 -#line 9861 "configure"
  20.134 +#line 9845 "configure"
  20.135  #include "confdefs.h"
  20.136  
  20.137  #if HAVE_DLFCN_H
  20.138 @@ -9954,7 +9938,7 @@
  20.139    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  20.140    lt_status=$lt_dlunknown
  20.141    cat > conftest.$ac_ext <<_LT_EOF
  20.142 -#line 9957 "configure"
  20.143 +#line 9941 "configure"
  20.144  #include "confdefs.h"
  20.145  
  20.146  #if HAVE_DLFCN_H
  20.147 @@ -12579,287 +12563,6 @@
  20.148  fi
  20.149  
  20.150  
  20.151 -# Check whether --enable-music-mp3-smpeg was given.
  20.152 -if test "${enable_music_mp3_smpeg+set}" = set; then :
  20.153 -  enableval=$enable_music_mp3_smpeg;
  20.154 -else
  20.155 -  enable_music_mp3_smpeg=no
  20.156 -fi
  20.157 -
  20.158 -# Check whether --enable-music-mp3-smpeg-shared was given.
  20.159 -if test "${enable_music_mp3_smpeg_shared+set}" = set; then :
  20.160 -  enableval=$enable_music_mp3_smpeg_shared;
  20.161 -else
  20.162 -  enable_music_mp3_smpeg_shared=yes
  20.163 -fi
  20.164 -
  20.165 -if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_smpeg = xyes; then
  20.166 -    SMPEG_VERSION=2.0.0
  20.167 -
  20.168 -# Check whether --with-smpeg-prefix was given.
  20.169 -if test "${with_smpeg_prefix+set}" = set; then :
  20.170 -  withval=$with_smpeg_prefix; smpeg_prefix="$withval"
  20.171 -else
  20.172 -  smpeg_prefix=""
  20.173 -fi
  20.174 -
  20.175 -
  20.176 -# Check whether --with-smpeg-exec-prefix was given.
  20.177 -if test "${with_smpeg_exec_prefix+set}" = set; then :
  20.178 -  withval=$with_smpeg_exec_prefix; smpeg_exec_prefix="$withval"
  20.179 -else
  20.180 -  smpeg_exec_prefix=""
  20.181 -fi
  20.182 -
  20.183 -# Check whether --enable-smpegtest was given.
  20.184 -if test "${enable_smpegtest+set}" = set; then :
  20.185 -  enableval=$enable_smpegtest;
  20.186 -else
  20.187 -  enable_smpegtest=yes
  20.188 -fi
  20.189 -
  20.190 -
  20.191 -  if test x$smpeg_exec_prefix != x ; then
  20.192 -     smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix"
  20.193 -     if test x${SMPEG_CONFIG+set} != xset ; then
  20.194 -        SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg2-config
  20.195 -     fi
  20.196 -  fi
  20.197 -  if test x$smpeg_prefix != x ; then
  20.198 -     smpeg_args="$smpeg_args --prefix=$smpeg_prefix"
  20.199 -     if test x${SMPEG_CONFIG+set} != xset ; then
  20.200 -        SMPEG_CONFIG=$smpeg_prefix/bin/smpeg2-config
  20.201 -     fi
  20.202 -  fi
  20.203 -
  20.204 -  # Extract the first word of "smpeg2-config", so it can be a program name with args.
  20.205 -set dummy smpeg2-config; ac_word=$2
  20.206 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  20.207 -$as_echo_n "checking for $ac_word... " >&6; }
  20.208 -if ${ac_cv_path_SMPEG_CONFIG+:} false; then :
  20.209 -  $as_echo_n "(cached) " >&6
  20.210 -else
  20.211 -  case $SMPEG_CONFIG in
  20.212 -  [\\/]* | ?:[\\/]*)
  20.213 -  ac_cv_path_SMPEG_CONFIG="$SMPEG_CONFIG" # Let the user override the test with a path.
  20.214 -  ;;
  20.215 -  *)
  20.216 -  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  20.217 -for as_dir in $PATH
  20.218 -do
  20.219 -  IFS=$as_save_IFS
  20.220 -  test -z "$as_dir" && as_dir=.
  20.221 -    for ac_exec_ext in '' $ac_executable_extensions; do
  20.222 -  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
  20.223 -    ac_cv_path_SMPEG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
  20.224 -    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
  20.225 -    break 2
  20.226 -  fi
  20.227 -done
  20.228 -  done
  20.229 -IFS=$as_save_IFS
  20.230 -
  20.231 -  test -z "$ac_cv_path_SMPEG_CONFIG" && ac_cv_path_SMPEG_CONFIG="no"
  20.232 -  ;;
  20.233 -esac
  20.234 -fi
  20.235 -SMPEG_CONFIG=$ac_cv_path_SMPEG_CONFIG
  20.236 -if test -n "$SMPEG_CONFIG"; then
  20.237 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SMPEG_CONFIG" >&5
  20.238 -$as_echo "$SMPEG_CONFIG" >&6; }
  20.239 -else
  20.240 -  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  20.241 -$as_echo "no" >&6; }
  20.242 -fi
  20.243 -
  20.244 -
  20.245 -  min_smpeg_version=$SMPEG_VERSION
  20.246 -  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMPEG - version >= $min_smpeg_version" >&5
  20.247 -$as_echo_n "checking for SMPEG - version >= $min_smpeg_version... " >&6; }
  20.248 -  no_smpeg=""
  20.249 -  if test "$SMPEG_CONFIG" = "no" ; then
  20.250 -    no_smpeg=yes
  20.251 -  else
  20.252 -    SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags`
  20.253 -    SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs`
  20.254 -
  20.255 -    smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \
  20.256 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
  20.257 -    smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \
  20.258 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
  20.259 -    smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \
  20.260 -           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
  20.261 -    if test "x$enable_smpegtest" = "xyes" ; then
  20.262 -      ac_save_CFLAGS="$CFLAGS"
  20.263 -      ac_save_LIBS="$LIBS"
  20.264 -      CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
  20.265 -      LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
  20.266 -      rm -f conf.smpegtest
  20.267 -      if test "$cross_compiling" = yes; then :
  20.268 -  echo $ac_n "cross compiling; assumed OK... $ac_c"
  20.269 -else
  20.270 -  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  20.271 -/* end confdefs.h.  */
  20.272 -
  20.273 -#include <stdio.h>
  20.274 -#include <stdlib.h>
  20.275 -#include <string.h>
  20.276 -#include "smpeg.h"
  20.277 -
  20.278 -char*
  20.279 -my_strdup (char *str)
  20.280 -{
  20.281 -  char *new_str;
  20.282 -
  20.283 -  if (str)
  20.284 -    {
  20.285 -      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
  20.286 -      strcpy (new_str, str);
  20.287 -    }
  20.288 -  else
  20.289 -    new_str = NULL;
  20.290 -
  20.291 -  return new_str;
  20.292 -}
  20.293 -
  20.294 -int main (int argc, char *argv[])
  20.295 -{
  20.296 -  int major, minor, micro;
  20.297 -  char *tmp_version;
  20.298 -
  20.299 -  /* This hangs on some systems (?)
  20.300 -  system ("touch conf.smpegtest");
  20.301 -  */
  20.302 -  { FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); }
  20.303 -
  20.304 -  /* HP/UX 9 (%@#!) writes to sscanf strings */
  20.305 -  tmp_version = my_strdup("$min_smpeg_version");
  20.306 -  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
  20.307 -     printf("%s, bad version string\n", "$min_smpeg_version");
  20.308 -     exit(1);
  20.309 -   }
  20.310 -
  20.311 -   if (($smpeg_major_version > major) ||
  20.312 -      (($smpeg_major_version == major) && ($smpeg_minor_version > minor)) ||
  20.313 -      (($smpeg_major_version == major) && ($smpeg_minor_version == minor) && ($smpeg_micro_version >= micro)))
  20.314 -    {
  20.315 -      return 0;
  20.316 -    }
  20.317 -  else
  20.318 -    {
  20.319 -      printf("\n*** 'smpeg2-config --version' returned %d.%d.%d, but the minimum version\n", $smpeg_major_version, $smpeg_minor_version, $smpeg_micro_version);
  20.320 -      printf("*** of SMPEG required is %d.%d.%d. If smpeg2-config is correct, then it is\n", major, minor, micro);
  20.321 -      printf("*** best to upgrade to the required version.\n");
  20.322 -      printf("*** If smpeg2-config was wrong, set the environment variable SMPEG_CONFIG\n");
  20.323 -      printf("*** to point to the correct copy of smpeg2-config, and remove the file\n");
  20.324 -      printf("*** config.cache before re-running configure\n");
  20.325 -      return 1;
  20.326 -    }
  20.327 -}
  20.328 -
  20.329 -
  20.330 -_ACEOF
  20.331 -if ac_fn_c_try_run "$LINENO"; then :
  20.332 -
  20.333 -else
  20.334 -  no_smpeg=yes
  20.335 -fi
  20.336 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  20.337 -  conftest.$ac_objext conftest.beam conftest.$ac_ext
  20.338 -fi
  20.339 -
  20.340 -       CFLAGS="$ac_save_CFLAGS"
  20.341 -       LIBS="$ac_save_LIBS"
  20.342 -     fi
  20.343 -  fi
  20.344 -  if test "x$no_smpeg" = x ; then
  20.345 -     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  20.346 -$as_echo "yes" >&6; }
  20.347 -     have_smpeg=yes
  20.348 -  else
  20.349 -     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  20.350 -$as_echo "no" >&6; }
  20.351 -     if test "$SMPEG_CONFIG" = "no" ; then
  20.352 -       echo "*** The smpeg2-config script installed by SMPEG could not be found"
  20.353 -       echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is in"
  20.354 -       echo "*** your path, or set the SMPEG_CONFIG environment variable to the"
  20.355 -       echo "*** full path to smpeg2-config."
  20.356 -     else
  20.357 -       if test -f conf.smpegtest ; then
  20.358 -        :
  20.359 -       else
  20.360 -          echo "*** Could not run SMPEG test program, checking why..."
  20.361 -          CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
  20.362 -          LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
  20.363 -          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  20.364 -/* end confdefs.h.  */
  20.365 -
  20.366 -#include <stdio.h>
  20.367 -#include "smpeg.h"
  20.368 -
  20.369 -int
  20.370 -main ()
  20.371 -{
  20.372 - return 0;
  20.373 -  ;
  20.374 -  return 0;
  20.375 -}
  20.376 -_ACEOF
  20.377 -if ac_fn_c_try_link "$LINENO"; then :
  20.378 -   echo "*** The test program compiled, but did not run. This usually means"
  20.379 -          echo "*** that the run-time linker is not finding SMPEG or finding the wrong"
  20.380 -          echo "*** version of SMPEG. If it is not finding SMPEG, you'll need to set your"
  20.381 -          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
  20.382 -          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
  20.383 -          echo "*** is required on your system"
  20.384 -          echo "***"
  20.385 -          echo "*** If you have an old version installed, it is best to remove it, although"
  20.386 -          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
  20.387 -else
  20.388 -   echo "*** The test program failed to compile or link. See the file config.log for the"
  20.389 -          echo "*** exact error that occured. This usually means SMPEG was incorrectly installed"
  20.390 -          echo "*** or that you have moved SMPEG since it was installed. In the latter case, you"
  20.391 -          echo "*** may want to edit the smpeg2-config script: $SMPEG_CONFIG"
  20.392 -fi
  20.393 -rm -f core conftest.err conftest.$ac_objext \
  20.394 -    conftest$ac_exeext conftest.$ac_ext
  20.395 -          CFLAGS="$ac_save_CFLAGS"
  20.396 -          LIBS="$ac_save_LIBS"
  20.397 -       fi
  20.398 -     fi
  20.399 -     SMPEG_CFLAGS=""
  20.400 -     SMPEG_LIBS=""
  20.401 -     have_smpeg=no
  20.402 -  fi
  20.403 -
  20.404 -
  20.405 -  rm -f conf.smpegtest
  20.406 -
  20.407 -    if test x$have_smpeg = xyes; then
  20.408 -        case "$host" in
  20.409 -            *-*-darwin*)
  20.410 -                smpeg_lib=`find_lib libsmpeg2.dylib`
  20.411 -                ;;
  20.412 -            *-*-cygwin* | *-*-mingw32*)
  20.413 -                smpeg_lib=`find_lib "smpeg2*.dll"`
  20.414 -                ;;
  20.415 -            *)
  20.416 -                smpeg_lib=`find_lib "libsmpeg2*.so.*"`
  20.417 -                ;;
  20.418 -        esac
  20.419 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS"
  20.420 -        if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
  20.421 -            echo "-- dynamic libsmpeg -> $smpeg_lib"
  20.422 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\""
  20.423 -        else
  20.424 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS"
  20.425 -        fi
  20.426 -    else
  20.427 -        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find SMPEG library (http://icculus.org/smpeg/)" >&5
  20.428 -$as_echo "$as_me: WARNING: *** Unable to find SMPEG library (http://icculus.org/smpeg/)" >&2;}
  20.429 -    fi
  20.430 -fi
  20.431 -
  20.432  # Check whether --enable-music-mp3-mad-gpl was given.
  20.433  if test "${enable_music_mp3_mad_gpl+set}" = set; then :
  20.434    enableval=$enable_music_mp3_mad_gpl;
  20.435 @@ -12985,7 +12688,7 @@
  20.436                  mpg123_lib=`find_lib "libmpg123*.dll"`
  20.437                  ;;
  20.438              *)
  20.439 -				mpg123_lib=`find_lib "libmpg123.so.*"`
  20.440 +		mpg123_lib=`find_lib "libmpg123.so.*"`
  20.441                  ;;
  20.442          esac
  20.443          EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
  20.444 @@ -13003,7 +12706,7 @@
  20.445      fi
  20.446  fi
  20.447  
  20.448 -if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
  20.449 +if test x$have_libmad = xyes -o x$have_libmpg123; then
  20.450      :
  20.451  else
  20.452      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled" >&5
    21.1 --- a/configure.in	Mon Oct 08 17:30:24 2018 +0300
    21.2 +++ b/configure.in	Wed Oct 10 17:56:10 2018 +0300
    21.3 @@ -572,39 +572,6 @@
    21.4  AC_HELP_STRING([--enable-music-mp3], [enable MP3 music [[default=yes]]]),
    21.5                [], enable_music_mp3=yes)
    21.6  
    21.7 -AC_ARG_ENABLE(music-mp3-smpeg,
    21.8 -AC_HELP_STRING([--enable-music-mp3-smpeg], [enable MP3 music via smpeg [[default=no]]]),
    21.9 -              [], enable_music_mp3_smpeg=no)
   21.10 -AC_ARG_ENABLE([music-mp3-smpeg-shared],
   21.11 -AC_HELP_STRING([--enable-music-mp3-smpeg-shared], [dynamically load smpeg library [[default=yes]]]),
   21.12 -              [], [enable_music_mp3_smpeg_shared=yes])
   21.13 -if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_smpeg = xyes; then
   21.14 -    SMPEG_VERSION=2.0.0
   21.15 -    AM_PATH_SMPEG2($SMPEG_VERSION, have_smpeg=yes, have_smpeg=no)
   21.16 -    if test x$have_smpeg = xyes; then
   21.17 -        case "$host" in
   21.18 -            *-*-darwin*)
   21.19 -                smpeg_lib=[`find_lib libsmpeg2.dylib`]
   21.20 -                ;;
   21.21 -            *-*-cygwin* | *-*-mingw32*)
   21.22 -                smpeg_lib=[`find_lib "smpeg2*.dll"`]
   21.23 -                ;;
   21.24 -            *)
   21.25 -                smpeg_lib=[`find_lib "libsmpeg2*.so.*"`]
   21.26 -                ;;
   21.27 -        esac
   21.28 -        EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_SMPEG $SMPEG_CFLAGS"
   21.29 -        if test x$enable_music_mp3_smpeg_shared = xyes && test x$smpeg_lib != x; then
   21.30 -            echo "-- dynamic libsmpeg -> $smpeg_lib"
   21.31 -            EXTRA_CFLAGS="$EXTRA_CFLAGS -DSMPEG_DYNAMIC=\\\"$smpeg_lib\\\""
   21.32 -        else
   21.33 -            EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SMPEG_LIBS"
   21.34 -        fi
   21.35 -    else
   21.36 -        AC_MSG_WARN([*** Unable to find SMPEG library (http://icculus.org/smpeg/)])
   21.37 -    fi
   21.38 -fi
   21.39 -
   21.40  AC_ARG_ENABLE(music-mp3-mad-gpl,
   21.41  AC_HELP_STRING([--enable-music-mp3-mad-gpl], [enable MP3 music via libmad GPL code [[default=no]]]),
   21.42                    [], [enable_music_mp3_mad_gpl=no])
   21.43 @@ -652,7 +619,7 @@
   21.44                  mpg123_lib=[`find_lib "libmpg123*.dll"`]
   21.45                  ;;
   21.46              *)
   21.47 -				mpg123_lib=[`find_lib "libmpg123.so.*"`]
   21.48 +		mpg123_lib=[`find_lib "libmpg123.so.*"`]
   21.49                  ;;
   21.50          esac
   21.51          EXTRA_CFLAGS="$EXTRA_CFLAGS -DMUSIC_MP3_MPG123"
   21.52 @@ -668,7 +635,7 @@
   21.53      fi
   21.54  fi
   21.55  
   21.56 -if test x$have_smpeg = xyes -o x$have_libmad = xyes -o x$have_libmpg123; then
   21.57 +if test x$have_libmad = xyes -o x$have_libmpg123; then
   21.58      :
   21.59  else
   21.60      AC_MSG_WARN([MP3 support disabled])
    22.1 --- a/debian/rules	Mon Oct 08 17:30:24 2018 +0300
    22.2 +++ b/debian/rules	Wed Oct 10 17:56:10 2018 +0300
    22.3 @@ -13,7 +13,6 @@
    22.4  # For mp3 support, libmad disabled by default because it is GPL and not allowed to link with commercial closed-source programs
    22.5  # For mod support, modplug is the default because it is in the public domain and used across all platforms.
    22.6  confflags += --enable-music-mp3
    22.7 -confflags += --enable-music-mp3-smpeg
    22.8  confflags += --disable-music-mp3-mad-gpl
    22.9  confflags += --enable-music-mod
   22.10  confflags += --enable-music-mod-modplug
   22.11 @@ -35,7 +34,6 @@
   22.12  # dependencies in the binary library package
   22.13  confflags += --disable-music-flac-shared
   22.14  confflags += --disable-music-ogg-shared
   22.15 -confflags += --disable-music-mp3-smpeg-shared
   22.16  confflags += --disable-music-mod-mikmod-shared
   22.17  confflags += --disable-music-mod-modplug-shared
   22.18  confflags += --disable-music-fluidsynth-shared
    23.1 --- a/music.c	Mon Oct 08 17:30:24 2018 +0300
    23.2 +++ b/music.c	Wed Oct 10 17:56:10 2018 +0300
    23.3 @@ -39,7 +39,6 @@
    23.4  #include "music_opus.h"
    23.5  #include "music_mpg123.h"
    23.6  #include "music_mad.h"
    23.7 -#include "music_smpeg.h"
    23.8  #include "music_flac.h"
    23.9  #include "native_midi/native_midi.h"
   23.10  
   23.11 @@ -102,9 +101,6 @@
   23.12  #ifdef MUSIC_MP3_MAD
   23.13      &Mix_MusicInterface_MAD,
   23.14  #endif
   23.15 -#ifdef MUSIC_MP3_SMPEG
   23.16 -    &Mix_MusicInterface_SMPEG,
   23.17 -#endif
   23.18  #ifdef MUSIC_MOD_MODPLUG
   23.19      &Mix_MusicInterface_MODPLUG,
   23.20  #endif
    24.1 --- a/music.h	Mon Oct 08 17:30:24 2018 +0300
    24.2 +++ b/music.h	Wed Oct 10 17:56:10 2018 +0300
    24.3 @@ -37,7 +37,6 @@
    24.4      MIX_MUSIC_OGG,
    24.5      MIX_MUSIC_MPG123,
    24.6      MIX_MUSIC_MAD,
    24.7 -    MIX_MUSIC_SMPEG,
    24.8      MIX_MUSIC_FLAC,
    24.9      MIX_MUSIC_OPUS,
   24.10      MIX_MUSIC_LAST
    25.1 --- a/music_smpeg.c	Mon Oct 08 17:30:24 2018 +0300
    25.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    25.3 @@ -1,237 +0,0 @@
    25.4 -/*
    25.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    25.6 -  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
    25.7 -
    25.8 -  This software is provided 'as-is', without any express or implied
    25.9 -  warranty.  In no event will the authors be held liable for any damages
   25.10 -  arising from the use of this software.
   25.11 -
   25.12 -  Permission is granted to anyone to use this software for any purpose,
   25.13 -  including commercial applications, and to alter it and redistribute it
   25.14 -  freely, subject to the following restrictions:
   25.15 -
   25.16 -  1. The origin of this software must not be misrepresented; you must not
   25.17 -     claim that you wrote the original software. If you use this software
   25.18 -     in a product, an acknowledgment in the product documentation would be
   25.19 -     appreciated but is not required.
   25.20 -  2. Altered source versions must be plainly marked as such, and must not be
   25.21 -     misrepresented as being the original software.
   25.22 -  3. This notice may not be removed or altered from any source distribution.
   25.23 -*/
   25.24 -
   25.25 -#ifdef MUSIC_MP3_SMPEG
   25.26 -
   25.27 -#include "SDL_loadso.h"
   25.28 -
   25.29 -#include "music_smpeg.h"
   25.30 -
   25.31 -#if SDL_VERSION_ATLEAST(2, 0, 0)
   25.32 -/* Forward declaration for SDL 2.0  because struct is not available there but
   25.33 -   still used in a file included with smpeg.h. May not compile if missing. */
   25.34 -typedef struct SDL_Overlay SDL_Overlay;
   25.35 -#endif
   25.36 -
   25.37 -#include "smpeg.h"
   25.38 -
   25.39 -typedef struct {
   25.40 -    int loaded;
   25.41 -    void *handle;
   25.42 -    void (*SMPEG_actualSpec)(SMPEG *mpeg, SDL_AudioSpec *spec);
   25.43 -    void (*SMPEG_delete)(SMPEG* mpeg);
   25.44 -    void (*SMPEG_enableaudio)(SMPEG* mpeg, int enable);
   25.45 -    void (*SMPEG_enablevideo)(SMPEG* mpeg, int enable);
   25.46 -    SMPEG* (*SMPEG_new_rwops)(SDL_RWops *src, SMPEG_Info* info, int freesrc, int sdl_audio);
   25.47 -    void (*SMPEG_play)(SMPEG* mpeg);
   25.48 -    int (*SMPEG_playAudio)(SMPEG *mpeg, Uint8 *stream, int len);
   25.49 -    void (*SMPEG_rewind)(SMPEG* mpeg);
   25.50 -    void (*SMPEG_setvolume)(SMPEG* mpeg, int volume);
   25.51 -    void (*SMPEG_skip)(SMPEG* mpeg, float seconds);
   25.52 -    SMPEGstatus (*SMPEG_status)(SMPEG* mpeg);
   25.53 -    void (*SMPEG_stop)(SMPEG* mpeg);
   25.54 -} smpeg_loader;
   25.55 -
   25.56 -static smpeg_loader smpeg = {
   25.57 -    0, NULL
   25.58 -};
   25.59 -
   25.60 -#ifdef SMPEG_DYNAMIC
   25.61 -#define FUNCTION_LOADER(FUNC, SIG) \
   25.62 -    smpeg.FUNC = (SIG) SDL_LoadFunction(smpeg.handle, #FUNC); \
   25.63 -    if (smpeg.FUNC == NULL) { SDL_UnloadObject(smpeg.handle); return -1; }
   25.64 -#else
   25.65 -#define FUNCTION_LOADER(FUNC, SIG) \
   25.66 -    smpeg.FUNC = FUNC;
   25.67 -#endif
   25.68 -
   25.69 -static int SMPEG_Load(void)
   25.70 -{
   25.71 -    if (smpeg.loaded == 0) {
   25.72 -#ifdef SMPEG_DYNAMIC
   25.73 -        smpeg.handle = SDL_LoadObject(SMPEG_DYNAMIC);
   25.74 -        if (smpeg.handle == NULL) {
   25.75 -            return -1;
   25.76 -        }
   25.77 -#elif defined(__MACOSX__)
   25.78 -        extern SMPEG* SMPEG_new_rwops(SDL_RWops*, SMPEG_Info*, int, int) __attribute__((weak_import));
   25.79 -        if (SMPEG_new_rwops == NULL)
   25.80 -        {
   25.81 -            /* Missing weakly linked framework */
   25.82 -            Mix_SetError("Missing smpeg2.framework");
   25.83 -            return -1;
   25.84 -        }
   25.85 -#endif
   25.86 -        FUNCTION_LOADER(SMPEG_actualSpec, void (*)(SMPEG *, SDL_AudioSpec *))
   25.87 -        FUNCTION_LOADER(SMPEG_delete, void (*)(SMPEG*))
   25.88 -        FUNCTION_LOADER(SMPEG_enableaudio, void (*)(SMPEG*, int))
   25.89 -        FUNCTION_LOADER(SMPEG_enablevideo, void (*)(SMPEG*, int))
   25.90 -        FUNCTION_LOADER(SMPEG_new_rwops, SMPEG* (*)(SDL_RWops *, SMPEG_Info*, int, int))
   25.91 -        FUNCTION_LOADER(SMPEG_play, void (*)(SMPEG*))
   25.92 -        FUNCTION_LOADER(SMPEG_playAudio, int (*)(SMPEG *, Uint8 *, int))
   25.93 -        FUNCTION_LOADER(SMPEG_rewind, void (*)(SMPEG*))
   25.94 -        FUNCTION_LOADER(SMPEG_setvolume, void (*)(SMPEG*, int))
   25.95 -        FUNCTION_LOADER(SMPEG_skip, void (*)(SMPEG*, float))
   25.96 -        FUNCTION_LOADER(SMPEG_status, SMPEGstatus (*)(SMPEG*))
   25.97 -        FUNCTION_LOADER(SMPEG_stop, void (*)(SMPEG*))
   25.98 -    }
   25.99 -    ++smpeg.loaded;
  25.100 -
  25.101 -    return 0;
  25.102 -}
  25.103 -
  25.104 -static void SMPEG_Unload(void)
  25.105 -{
  25.106 -    if (smpeg.loaded == 0) {
  25.107 -        return;
  25.108 -    }
  25.109 -    if (smpeg.loaded == 1) {
  25.110 -#ifdef SMPEG_DYNAMIC
  25.111 -        SDL_UnloadObject(smpeg.handle);
  25.112 -#endif
  25.113 -    }
  25.114 -    --smpeg.loaded;
  25.115 -}
  25.116 -
  25.117 -
  25.118 -typedef struct
  25.119 -{
  25.120 -    SMPEG *mp3;
  25.121 -    SDL_RWops *src;
  25.122 -    int freesrc;
  25.123 -} SMPEG_Music;
  25.124 -
  25.125 -static void *SMPEG_CreateFromRW(SDL_RWops *src, int freesrc)
  25.126 -{
  25.127 -    SMPEG_Music *music;
  25.128 -    SMPEG_Info info;
  25.129 -
  25.130 -    music = (SMPEG_Music *)SDL_calloc(1, sizeof(*music));
  25.131 -    if (!music) {
  25.132 -        SDL_OutOfMemory();
  25.133 -        return NULL;
  25.134 -    }
  25.135 -    music->src = src;
  25.136 -
  25.137 -    music->mp3 = smpeg.SMPEG_new_rwops(src, &info, SDL_FALSE, 0);
  25.138 -    if (!info.has_audio) {
  25.139 -        Mix_SetError("MPEG file does not have any audio stream.");
  25.140 -        smpeg.SMPEG_delete(music->mp3);
  25.141 -        SDL_free(music);
  25.142 -        return NULL;
  25.143 -    }
  25.144 -    smpeg.SMPEG_actualSpec(music->mp3, &music_spec);
  25.145 -
  25.146 -    music->freesrc = freesrc;
  25.147 -    return music;
  25.148 -}
  25.149 -
  25.150 -static void SMPEG_SetVolume(void *context, int volume)
  25.151 -{
  25.152 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.153 -    smpeg.SMPEG_setvolume(music->mp3,(int)(((float)volume/(float)MIX_MAX_VOLUME)*100.0));
  25.154 -}
  25.155 -
  25.156 -static int SMPEG_Play(void *context)
  25.157 -{
  25.158 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.159 -    smpeg.SMPEG_enableaudio(music->mp3, 1);
  25.160 -    smpeg.SMPEG_enablevideo(music->mp3, 0);
  25.161 -    smpeg.SMPEG_rewind(music->mp3);
  25.162 -    smpeg.SMPEG_play(music->mp3);
  25.163 -    return 0;
  25.164 -}
  25.165 -
  25.166 -static SDL_bool SMPEG_IsPlaying(void *context)
  25.167 -{
  25.168 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.169 -    return smpeg.SMPEG_status(music->mp3) == SMPEG_PLAYING ? SDL_TRUE : SDL_FALSE;
  25.170 -}
  25.171 -
  25.172 -static int SMPEG_GetAudio(void *context, void *data, int bytes)
  25.173 -{
  25.174 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.175 -    Uint8 *stream = (Uint8 *)data;
  25.176 -    int len = bytes;
  25.177 -    int left = (len - smpeg.SMPEG_playAudio(music->mp3, stream, len));
  25.178 -    if (left > 0) {
  25.179 -        stream += (len - left);
  25.180 -    }
  25.181 -    return left;
  25.182 -}
  25.183 -
  25.184 -static int SMPEG_Seek(void *context, double position)
  25.185 -{
  25.186 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.187 -    smpeg.SMPEG_rewind(music->mp3);
  25.188 -    smpeg.SMPEG_play(music->mp3);
  25.189 -    if (position > 0.0) {
  25.190 -        smpeg.SMPEG_skip(music->mp3, (float)position);
  25.191 -    }
  25.192 -    return 0;
  25.193 -}
  25.194 -
  25.195 -static void SMPEG_Stop(void *context)
  25.196 -{
  25.197 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.198 -    smpeg.SMPEG_stop(music->mp3);
  25.199 -}
  25.200 -
  25.201 -static void SMPEG_Delete(void *context)
  25.202 -{
  25.203 -    SMPEG_Music *music = (SMPEG_Music *)context;
  25.204 -
  25.205 -    smpeg.SMPEG_delete(music->mp3);
  25.206 -
  25.207 -    if (music->freesrc) {
  25.208 -        SDL_RWclose(music->src);
  25.209 -    }
  25.210 -    SDL_free(music);
  25.211 -}
  25.212 -
  25.213 -Mix_MusicInterface Mix_MusicInterface_SMPEG =
  25.214 -{
  25.215 -    "SMPEG",
  25.216 -    MIX_MUSIC_SMPEG,
  25.217 -    MUS_MP3,
  25.218 -    SDL_FALSE,
  25.219 -    SDL_FALSE,
  25.220 -
  25.221 -    SMPEG_Load,
  25.222 -    NULL,   /* Open */
  25.223 -    SMPEG_CreateFromRW,
  25.224 -    NULL,   /* CreateFromFile */
  25.225 -    SMPEG_SetVolume,
  25.226 -    SMPEG_Play,
  25.227 -    SMPEG_IsPlaying,
  25.228 -    SMPEG_GetAudio,
  25.229 -    SMPEG_Seek,
  25.230 -    NULL,   /* Pause */
  25.231 -    NULL,   /* Resume */
  25.232 -    SMPEG_Stop,
  25.233 -    SMPEG_Delete,
  25.234 -    NULL,   /* Close */
  25.235 -    SMPEG_Unload,
  25.236 -};
  25.237 -
  25.238 -#endif /* MUSIC_MP3_SMPEG */
  25.239 -
  25.240 -/* vi: set ts=4 sw=4 expandtab: */
    26.1 --- a/music_smpeg.h	Mon Oct 08 17:30:24 2018 +0300
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,28 +0,0 @@
    26.4 -/*
    26.5 -  SDL_mixer:  An audio mixer library based on the SDL library
    26.6 -  Copyright (C) 1997-2018 Sam Lantinga <slouken@libsdl.org>
    26.7 -
    26.8 -  This software is provided 'as-is', without any express or implied
    26.9 -  warranty.  In no event will the authors be held liable for any damages
   26.10 -  arising from the use of this software.
   26.11 -
   26.12 -  Permission is granted to anyone to use this software for any purpose,
   26.13 -  including commercial applications, and to alter it and redistribute it
   26.14 -  freely, subject to the following restrictions:
   26.15 -
   26.16 -  1. The origin of this software must not be misrepresented; you must not
   26.17 -     claim that you wrote the original software. If you use this software
   26.18 -     in a product, an acknowledgment in the product documentation would be
   26.19 -     appreciated but is not required.
   26.20 -  2. Altered source versions must be plainly marked as such, and must not be
   26.21 -     misrepresented as being the original software.
   26.22 -  3. This notice may not be removed or altered from any source distribution.
   26.23 -*/
   26.24 -
   26.25 -/* This file supports playing MP3 files with smpeg */
   26.26 -
   26.27 -#include "music.h"
   26.28 -
   26.29 -extern Mix_MusicInterface Mix_MusicInterface_SMPEG;
   26.30 -
   26.31 -/* vi: set ts=4 sw=4 expandtab: */