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

Removed accidentally copied/pasted script for ALSA detection

Browse source 
It's only a warning if dynamic loading code isn't possible.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401471
This commit is contained in:
Sam Lantinga 2006-03-06 00:50:03 +00:00
parent a401cf0a7a
commit 0e67f0fd20
1 changed files with 16 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

64
configure.in
View file

@ -324,7 +324,7 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [def
BUILD_CFLAGS="$BUILD_CFLAGS $ALSA_CFLAGS"
if test x$have_loadso != xyes && \
test x$enable_alsa_shared = xyes; then
AC_MSG_ERROR([You must have SDL_LoadObject() support])
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
fi
if test x$have_loadso = xyes && \
test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
@ -335,42 +335,6 @@ AC_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [def
have_audio=yes
fi
fi
if test x$have_alsa = xyes; then
AC_ARG_ENABLE(alsa-shared,
[ --enable-alsa-shared dynamically load ALSA audio support [default=yes]],
, enable_alsa_shared=yes)
if test "x`echo $ALSA_LIBS | grep -- -L`" = "x"; then
if test "x`ls /lib/libasound.so.* 2> /dev/null`" != "x"; then
ALSA_LIBS="-L/lib $ALSA_LIBS"
elif test "x`ls /usr/lib/libasound.so.* 2> /dev/null`" != "x"; then
ALSA_LIBS="-L/usr/lib $ALSA_LIBS"
elif test "x`ls /usr/local/lib/libasound.so.* 2> /dev/null`" != "x"; then
ALSA_LIBS="-L/usr/local/lib $ALSA_LIBS"
fi
fi
alsa_lib_spec=`echo $ALSA_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libasound.so.*/'`
alsa_lib=`ls $alsa_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $alsa_lib_spec -> $alsa_lib"
if test x$have_loadso != xyes && \
test x$enable_alsa_shared = xyes; then
AC_MSG_ERROR([You must have SDL_LoadObject() support])
fi
if test x$have_loadso = xyes && \
test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
CFLAGS="$CFLAGS -DALSA_SUPPORT -DALSA_DYNAMIC=\$(alsa_lib) $ALSA_CFLAGS"
AC_SUBST(alsa_lib)
use_dlvsym=no
AC_CHECK_LIB(dl, dlvsym, [use_dlvsym=yes])
if test x$use_dlvsym = xyes; then
CFLAGS="$CFLAGS -DUSE_DLVSYM"
fi
else
CFLAGS="$CFLAGS -DALSA_SUPPORT $ALSA_CFLAGS"
SYSTEM_LIBS="$SYSTEM_LIBS $ALSA_LIBS"
fi
fi
}
dnl Check whether we want to use IRIX 6.5+ native audio or not
@ -450,18 +414,20 @@ AC_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [defau
esd_lib_spec=`echo $ESD_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libesd.so.*/'`
esd_lib=`ls $esd_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $esd_lib_spec -> $esd_lib"
AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
BUILD_CFLAGS="$BUILD_CFLAGS $ESD_CFLAGS"
if test x$have_loadso != xyes && \
test x$enable_esd_shared = xyes; then
AC_MSG_ERROR([You must have SDL_LoadObject() support])
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ESD loading])
fi
if test x$have_loadso = xyes && \
test x$enable_esd_shared = xyes && test x$esd_lib != x; then
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib")
else
BUILD_LDFLAGS="$BUILD_LDFLAGS $ESD_LIBS"
fi
AC_DEFINE(SDL_AUDIO_DRIVER_ESD)
SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
BUILD_CFLAGS="$BUILD_CFLAGS $ESD_CFLAGS"
BUILD_LDFLAGS="$BUILD_LDFLAGS $ESD_LIBS"
have_audio=yes
fi
fi
@ -500,18 +466,20 @@ AC_HELP_STRING([--enable-arts-shared], [dynamically load aRts audio support [def
arts_lib_spec="$ARTS_PREFIX/lib/libartsc.so.*"
arts_lib=`ls $arts_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
echo "-- $arts_lib_spec -> $arts_lib"
AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
BUILD_CFLAGS="$BUILD_CFLAGS $ARTS_CFLAGS"
if test x$have_loadso != xyes && \
test x$enable_arts_shared = xyes; then
AC_MSG_ERROR([You must have SDL_LoadObject() support])
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ARTS loading])
fi
if test x$have_loadso = xyes && \
test x$enable_arts_shared = xyes && test x$arts_lib != x; then
AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib")
else
BUILD_LDFLAGS="$BUILD_LDFLAGS $ARTS_LIBS"
fi
AC_DEFINE(SDL_AUDIO_DRIVER_ARTS)
SOURCES="$SOURCES $srcdir/src/audio/arts/*.c"
BUILD_CFLAGS="$BUILD_CFLAGS $ARTS_CFLAGS"
BUILD_LDFLAGS="$BUILD_LDFLAGS $ARTS_LIBS"
have_audio=yes
fi
fi
@ -797,7 +765,7 @@ AC_HELP_STRING([--enable-x11-shared], [dynamically load X11 support [default=yes
fi
if test x$have_loadso != xyes && \
test x$enable_x11_shared = xyes; then
AC_MSG_ERROR([You must have SDL_LoadObject() support])
AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic X11 loading])
fi
if test x$have_loadso = xyes && \