pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only show the dynamic audio libraries if we'll be dynamically loading them

Browse source 
Fixed DirectFB dynamic loading to use find_lib
Converted tabs to spaces

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404073
This commit is contained in:
Sam Lantinga 2009-10-13 06:49:29 +00:00
parent 7361b514e2
commit e1e9af7e0e
1 changed files with 24 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
configure.in
View file

@ -625,7 +625,6 @@ AC_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
, enable_alsa_shared=yes)
alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
echo "-- dynamic libasound -> $alsa_lib"
AC_DEFINE(SDL_AUDIO_DRIVER_ALSA)
SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
@ -636,6 +635,7 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[de
fi
if test x$have_loadso = xyes && \
test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
echo "-- dynamic libasound -> $alsa_lib"
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
@ -720,7 +720,6 @@ AC_HELP_STRING([--enable-esd], [support the Enlightened Sound Daemon [[default=y
AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
, enable_esd_shared=yes)
esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
echo "-- dynamic libesd -> $esd_lib"
AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
@ -731,6 +730,7 @@ AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[defa
fi
if test x$have_loadso = xyes && \
test x$enable_esd_shared = xyes && test x$esd_lib != x; then
echo "-- dynamic libesd -> $esd_lib"
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
@ -767,7 +767,6 @@ AC_HELP_STRING([--enable-pulseaudio], [use PulseAudio [[default=yes]]]),
AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio support [[default=yes]]]),
, enable_pulseaudio_shared=yes)
pulseaudio_lib=[`find_lib "libpulse-simple.so.*" "$PULSEAUDIO_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
echo "-- dynamic libpulse-simple -> $pulseaudio_lib"
AC_DEFINE(SDL_AUDIO_DRIVER_PULSEAUDIO)
SOURCES="$SOURCES $srcdir/src/audio/pulseaudio/*.c"
@ -778,6 +777,7 @@ AC_HELP_STRING([--enable-pulseaudio-shared], [dynamically load PulseAudio suppor
fi
if test x$have_loadso = xyes && \
test x$enable_pulseaudio_shared = xyes && test x$pulseaudio_lib != x; then
echo "-- dynamic libpulse-simple -> $pulseaudio_lib"
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC, "$pulseaudio_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $PULSEAUDIO_LIBS"
@ -817,7 +817,6 @@ AC_HELP_STRING([--enable-arts], [support the Analog Real Time Synthesizer [[defa
AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[default=yes]]]),
, enable_arts_shared=yes)
arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
echo "-- dynamic libartsc -> $arts_lib"
AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
@ -828,6 +827,7 @@ AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [[de
fi
if test x$have_loadso = xyes && \
test x$enable_arts_shared = xyes && test x$arts_lib != x; then
echo "-- dynamic libartsc -> $arts_lib"
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS"
@ -875,7 +875,6 @@ AC_HELP_STRING([--enable-nas], [support the NAS audio API [[default=yes]]]),
AC_HELP_STRING([--enable-nas-shared], [dynamically load NAS audio support [[default=yes]]]),
, enable_nas_shared=yes)
nas_lib=[`find_lib "libaudio.so.*" "$NAS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
echo "-- dynamic libaudio -> $nas_lib"
if test x$have_loadso != xyes && \
test x$enable_nas_shared = xyes; then
@ -883,6 +882,7 @@ AC_HELP_STRING([--enable-nas-shared], [dynamically load NAS audio support [[defa
fi
if test x$have_loadso = xyes && \
test x$enable_nas_shared = xyes && test x$nas_lib != x; then
echo "-- dynamic libaudio -> $nas_lib"
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_NAS_DYNAMIC, "$nas_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS"
@ -1340,9 +1340,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
AC_MSG_CHECKING(for directfb dynamic loading support)
directfb_shared=no
directfb_lib_spec="$DIRECTFB_PREFIX/lib/libdirectfb.so*"
directfb_lib=`ls -- $directfb_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
dnl echo "-- $directfb_lib_spec -> $directfb_lib"
directfb_lib=[`find_lib "libdirectfb.so.*" "$DIRECTFB_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
if test x$have_loadso != xyes && \
test x$enable_directfb_shared = xyes; then
@ -1351,6 +1349,7 @@ AC_HELP_STRING([--enable-directfb-shared], [dynamically load directfb support [[
if test x$have_loadso = xyes && \
test x$enable_directfb_shared = xyes && test x$directfb_lib != x; then
directfb_shared=yes
echo "-- $directfb_lib_spec -> $directfb_lib"
AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC, "$directfb_lib")
else
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS"