Skip to content

Commit

Permalink
fixes to autotools find_lib usage for mac
Browse files Browse the repository at this point in the history 
c.f.: libsdl-org/SDL_image#395.
  • Loading branch information
@sezero
sezero committed Oct 22, 2023
1 parent cef5950 commit 5885b5e
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 20 deletions.
50 changes: 40 additions & 10 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17279,7 +17279,10 @@ fi
have_libmodplug=yes
case "$host" in
*-*-darwin*)
modplug_lib=`find_lib libmodplug.dylib`
modplug_lib=`find_lib "libmodplug.[0-9]*.dylib"`
if test x$modplug_lib = x; then
modplug_lib=`find_lib libmodplug.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
modplug_lib=`find_lib "libmodplug*.dll"`
Expand Down Expand Up @@ -17512,7 +17515,10 @@ fi
have_libxmp=yes
case "$host" in
*-*-darwin*)
xmp_lib=`find_lib lib$xmplib.dylib`
xmp_lib=`find_lib "lib$xmplib.[0-9]*.dylib"`
if test x$xmp_lib = x; then
xmp_lib=`find_lib lib$xmplib.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
xmp_lib=`find_lib "lib$xmplib*.dll"`
Expand Down Expand Up @@ -17813,7 +17819,10 @@ fi
have_fluidsynth=yes
case "$host" in
*-*-darwin*)
fluidsynth_lib=`find_lib libfluidsynth.dylib`
fluidsynth_lib=`find_lib "libfluidsynth.[0-9]*.dylib"`
if test x$fluidsynth_lib = x; then
fluidsynth_lib=`find_lib libfluidsynth.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
fluidsynth_lib=`find_lib "fluidsynth*.dll"`
Expand Down Expand Up @@ -18045,7 +18054,10 @@ fi
have_gme=yes
case "$host" in
*-*-darwin*)
gme_lib=`find_lib libgme.dylib`
gme_lib=`find_lib "libgme.[0-9]*.dylib"`
if test x$gme_lib = x; then
gme_lib=`find_lib libgme.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
gme_lib=`find_lib "libgme*.dll"`
Expand Down Expand Up @@ -18290,7 +18302,10 @@ fi
have_vorbis=yes
case "$host" in
*-*-darwin*)
ogg_lib=`find_lib libvorbisfile.dylib`
ogg_lib=`find_lib "libvorbisfile.[0-9]*.dylib"`
if test x$ogg_lib = x; then
ogg_lib=`find_lib libvorbisfile.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
ogg_lib=`find_lib "libvorbisfile*.dll"`
Expand Down Expand Up @@ -18512,7 +18527,10 @@ fi
have_tremor=yes
case "$host" in
*-*-darwin*)
ogg_lib=`find_lib libvorbisidec.dylib`
ogg_lib=`find_lib "libvorbisidec.[0-9]*.dylib"`
if test x$ogg_lib = x; then
ogg_lib=`find_lib libvorbisidec.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
ogg_lib=`find_lib "vorbisidec*.dll"`
Expand Down Expand Up @@ -18801,7 +18819,10 @@ printf "%s\n" "$have_flac_ver" >&6; }
have_libflac=yes
case "$host" in
*-*-darwin*)
flac_lib=`find_lib libFLAC.dylib`
flac_lib=`find_lib "libFLAC.[0-9]*.dylib"`
if test x$flac_lib = x; then
flac_lib=`find_lib libFLAC.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
flac_lib=`find_lib "libFLAC*.dll"`
Expand Down Expand Up @@ -19050,7 +19071,10 @@ fi
have_libmpg123=yes
case "$host" in
*-*-darwin*)
mpg123_lib=`find_lib libmpg123.dylib`
mpg123_lib=`find_lib "libmpg123.[0-9]*.dylib"`
if test x$mpg123_lib = x; then
mpg123_lib=`find_lib libmpg123.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
mpg123_lib=`find_lib "libmpg123*.dll"`
Expand Down Expand Up @@ -19274,7 +19298,10 @@ fi
have_opusfile=yes
case "$host" in
*-*-darwin*)
opusfile_lib=`find_lib libopusfile.dylib`
opusfile_lib=`find_lib "libopusfile.[0-9]*.dylib"`
if test x$opusfile_lib = x; then
opusfile_lib=`find_lib libopusfile.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
opusfile_lib=`find_lib "libopusfile*.dll"`
Expand Down Expand Up @@ -19529,7 +19556,10 @@ fi
have_wavpack=yes
case "$host" in
*-*-darwin*)
wavpack_lib=`find_lib libwavpack.dylib`
wavpack_lib=`find_lib "libwavpack.[0-9]*.dylib"`
if test x$wavpack_lib = x; then
wavpack_lib=`find_lib libwavpack.dylib`
fi
;;
*-*-cygwin* | *-*-mingw*)
wavpack_lib=`find_lib "libwavpack*.dll"`
Expand Down
50 changes: 40 additions & 10 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,10 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_modplug = xyes; then
have_libmodplug=yes
case "$host" in
*-*-darwin*)
modplug_lib=[`find_lib libmodplug.dylib`]
modplug_lib=[`find_lib "libmodplug.[0-9]*.dylib"`]
if test x$modplug_lib = x; then
modplug_lib=[`find_lib libmodplug.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
modplug_lib=[`find_lib "libmodplug*.dll"`]
Expand Down Expand Up @@ -419,7 +422,10 @@ if test x$enable_music_mod = xyes -a x$enable_music_mod_xmp = xyes; then
have_libxmp=yes
case "$host" in
*-*-darwin*)
xmp_lib=[`find_lib lib$xmplib.dylib`]
xmp_lib=[`find_lib "lib$xmplib.[0-9]*.dylib"`]
if test x$xmp_lib = x; then
xmp_lib=[`find_lib lib$xmplib.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
xmp_lib=[`find_lib "lib$xmplib*.dll"`]
Expand Down Expand Up @@ -530,7 +536,10 @@ if test x$enable_music_midi = xyes; then
have_fluidsynth=yes
case "$host" in
*-*-darwin*)
fluidsynth_lib=[`find_lib libfluidsynth.dylib`]
fluidsynth_lib=[`find_lib "libfluidsynth.[0-9]*.dylib"`]
if test x$fluidsynth_lib = x; then
fluidsynth_lib=[`find_lib libfluidsynth.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
fluidsynth_lib=[`find_lib "fluidsynth*.dll"`]
Expand Down Expand Up @@ -591,7 +600,10 @@ if test x$enable_music_gme = xyes; then
have_gme=yes
case "$host" in
*-*-darwin*)
gme_lib=[`find_lib libgme.dylib`]
gme_lib=[`find_lib "libgme.[0-9]*.dylib"`]
if test x$gme_lib = x; then
gme_lib=[`find_lib libgme.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
gme_lib=[`find_lib "libgme*.dll"`]
Expand Down Expand Up @@ -656,7 +668,10 @@ if test x$enable_music_ogg = xyes -a x$enable_music_ogg_vorbis = xyes; then
have_vorbis=yes
case "$host" in
*-*-darwin*)
ogg_lib=[`find_lib libvorbisfile.dylib`]
ogg_lib=[`find_lib "libvorbisfile.[0-9]*.dylib"`]
if test x$ogg_lib = x; then
ogg_lib=[`find_lib libvorbisfile.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
ogg_lib=[`find_lib "libvorbisfile*.dll"`]
Expand Down Expand Up @@ -709,7 +724,10 @@ if test x$enable_music_ogg = xyes -a x$enable_music_ogg_tremor = xyes; then
have_tremor=yes
case "$host" in
*-*-darwin*)
ogg_lib=[`find_lib libvorbisidec.dylib`]
ogg_lib=[`find_lib "libvorbisidec.[0-9]*.dylib"`]
if test x$ogg_lib = x; then
ogg_lib=[`find_lib libvorbisidec.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
ogg_lib=[`find_lib "vorbisidec*.dll"`]
Expand Down Expand Up @@ -799,7 +817,10 @@ if test x$enable_music_flac = xyes -a x$enable_music_flac_libflac = xyes; then
have_libflac=yes
case "$host" in
*-*-darwin*)
flac_lib=[`find_lib libFLAC.dylib`]
flac_lib=[`find_lib "libFLAC.[0-9]*.dylib"`]
if test x$flac_lib = x; then
flac_lib=[`find_lib libFLAC.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
flac_lib=[`find_lib "libFLAC*.dll"`]
Expand Down Expand Up @@ -868,7 +889,10 @@ if test x$enable_music_mp3 = xyes -a x$enable_music_mp3_mpg123 = xyes; then
have_libmpg123=yes
case "$host" in
*-*-darwin*)
mpg123_lib=[`find_lib libmpg123.dylib`]
mpg123_lib=[`find_lib "libmpg123.[0-9]*.dylib"`]
if test x$mpg123_lib = x; then
mpg123_lib=[`find_lib libmpg123.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
mpg123_lib=[`find_lib "libmpg123*.dll"`]
Expand Down Expand Up @@ -922,7 +946,10 @@ if test x$enable_music_opus = xyes; then
have_opusfile=yes
case "$host" in
*-*-darwin*)
opusfile_lib=[`find_lib libopusfile.dylib`]
opusfile_lib=[`find_lib "libopusfile.[0-9]*.dylib"`]
if test x$opusfile_lib = x; then
opusfile_lib=[`find_lib libopusfile.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
opusfile_lib=[`find_lib "libopusfile*.dll"`]
Expand Down Expand Up @@ -986,7 +1013,10 @@ if test x$enable_music_wavpack = xyes; then
have_wavpack=yes
case "$host" in
*-*-darwin*)
wavpack_lib=[`find_lib libwavpack.dylib`]
wavpack_lib=[`find_lib "libwavpack.[0-9]*.dylib"`]
if test x$wavpack_lib = x; then
wavpack_lib=[`find_lib libwavpack.dylib`]
fi
;;
*-*-cygwin* | *-*-mingw*)
wavpack_lib=[`find_lib "libwavpack*.dll"`]
Expand Down

0 comments on commit 5885b5e

Please sign in to comment.