actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move audio format checks to a file

Browse Source
This commit is contained in:
Glenn Maynard
2003-09-20 20:03:44 +00:00
parent 47fc0d88fb
commit 0a64a82d82
2 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/autoconf/m4/audio.m4
+74
View File
@@ -0,0 +1,74 @@
AC_DEFUN(SM_AUDIO, [
AC_ARG_WITH(vorbis, AC_HELP_STRING([--without-vorbis], [Disable Vorbis support]), with_vorbis=$enableval, with_vorbis=yes)
# This is used to force the integer decoder, on systems that prefer it.
AC_ARG_WITH(integer-vorbis, AC_HELP_STRING([--with-integer-vorbis], [Integer vorbis decoding only]), with_int_vorbis=$withval, with_int_vorbis=no)
have_vorbis=no
if test "$with_vorbis" = "yes" -a "$with_int_vorbis" = "no"; then
oldlibs="$LIBS"
AC_CHECK_LIB(ogg, ogg_stream_init, have_libogg=yes, have_libogg=no)
AC_CHECK_LIB(vorbis, vorbis_comment_add, have_libvorbis=yes, have_libvorbis=no, -logg)
AC_CHECK_LIB(vorbisfile, ov_open, have_libvorbisfile=yes, have_libvorbisfile=no, -logg -lvorbis)
if test "$have_libvorbis" = "yes" -a "$have_libogg" = "yes" -a "$have_libvorbisfile" = "yes"; then
have_vorbis=yes
AUDIO_LIBS="$AUDIO_LIBS -lvorbis -logg -lvorbisfile"
else
echo Not all vorbis libraries found.
LIBS="$oldlibs"
fi
fi
# Search for the integer decoder if specified, or if Vorbis is enabled and we failed
# above.
if test "$with_vorbis" = "yes" -a "$have_vorbis" = "no"; then
AC_CHECK_LIB(ivorbisfile, ov_open, have_libivorbisfile=yes, have_libivorbisfile=no)
if test "$have_libivorbisfile" = "yes"; then
have_vorbis=yes
AUDIO_LIBS="$AUDIO_LIBS -livorbisfile"
AC_DEFINE(INTEGER_VORBIS, 1, [Integer Vorbis decoding])
fi
fi
if test "$have_vorbis" = "no"; then
if test "$with_vorbis" = "yes"; then
AC_MSG_ERROR(
[A working installation of Ogg Vorbis could not be found. Vorbis
support is strongly recommended. If you really want to compile without it, pass
the "--without-vorbis" flag to configure.])
fi
AC_DEFINE(NO_VORBIS_SUPPORT, 1, [Vorbis support not available])
fi
AM_CONDITIONAL(HAVE_VORBIS, test "$have_vorbis" = "yes" )
AC_ARG_WITH(mp3, AC_HELP_STRING([--without-mp3], [Disable MP3 support]), with_mp3=$withval, with_mp3=yes)
if test "$with_mp3" = "yes"; then
AC_CHECK_LIB(mad, mad_synth_init, have_mad=yes, have_mad=no)
else
have_mad=no
fi
if test "$have_mad" = "no"; then
# Require MP3 by default, so people don't compile without MP3 support
# by accident and then come asking us why files won't load.
if test "$with_mp3" = "yes"; then
AC_MSG_ERROR(
[A working installation of MAD could not be found, which is
required for MP3 support. If you really want to compile without MP3 support,
pass the "--without-mp3" flag to configure.])
fi
AC_DEFINE(NO_MP3_SUPPORT, 1, [MP3 support not available])
else
AUDIO_LIBS="$AUDIO_LIBS -lmad"
fi
AC_SUBST(AUDIO_LIBS)
AM_CONDITIONAL(HAVE_MP3, test "$have_mad" = "yes" )
])
stepmania/configure.ac
+1 -64
View File
@@ -40,70 +40,7 @@ AM_CONDITIONAL(NHAVE_SDL, test x$enable_sdl = xno )
# exit 0;
#fi
AC_ARG_WITH(vorbis, AC_HELP_STRING([--without-vorbis], [Disable Vorbis support]), with_vorbis=$enableval, with_vorbis=yes)
# This is used to force the integer decoder, on systems that prefer it.
AC_ARG_WITH(integer-vorbis, AC_HELP_STRING([--with-integer-vorbis], [Integer vorbis decoding only]), with_int_vorbis=$withval, with_int_vorbis=no)
have_vorbis=no
if test "$with_vorbis" = "yes" -a "$with_int_vorbis" = "no"; then
oldlibs="$LIBS"
AC_SEARCH_LIBS(ogg_stream_init, [ogg], have_libogg=yes, have_libogg=no)
AC_SEARCH_LIBS(vorbis_comment_add, [vorbis], have_libvorbis=yes, have_libvorbis=no)
AC_SEARCH_LIBS(ov_open, [vorbisfile], have_libvorbisfile=yes, have_libvorbisfile=no)
if test "$have_libvorbis" = "yes" -a "$have_libogg" = "yes" -a "$have_libvorbisfile" = "yes"; then
have_vorbis=yes
else
echo Not all vorbis libraries found.
LIBS="$oldlibs"
fi
fi
# Search for the integer decoder if specified, or if Vorbis is enabled and we failed
# above.
if test "$with_vorbis" = "yes" -a "$have_vorbis" = "no"; then
AC_SEARCH_LIBS(ov_open, [ivorbisfile], have_libivorbisfile=yes, have_libivorbisfile=no)
if test "$have_libivorbisfile" = "yes"; then
have_vorbis=yes
AC_DEFINE(INTEGER_VORBIS, 1, [Integer Vorbis decoding])
fi
fi
if test "$have_vorbis" = "no"; then
if test "$with_vorbis" = "yes"; then
AC_MSG_ERROR(
[A working installation of Ogg Vorbis could not be found. Vorbis
support is strongly recommended. If you really want to compile without it, pass
the "--without-vorbis" flag to configure.])
fi
AC_DEFINE(NO_VORBIS_SUPPORT, 1, [Vorbis support not available])
fi
AM_CONDITIONAL(HAVE_VORBIS, test "$have_vorbis" = "yes" )
AC_ARG_WITH(mp3, AC_HELP_STRING([--without-mp3], [Disable MP3 support]), with_mp3=$withval, with_mp3=yes)
if test "$with_mp3" = "yes"; then
AC_SEARCH_LIBS(mad_synth_init, [mad], have_mad=yes, have_mad=no)
else
have_mad=no
fi
if test "$have_mad" = "no"; then
# Require MP3 by default, so people don't compile without MP3 support
# by accident and then come asking us why files won't load.
if test "$with_mp3" = "yes"; then
AC_MSG_ERROR(
[A working installation of MAD could not be found, which is
required for MP3 support. If you really want to compile without MP3 support,
pass the "--without-mp3" flag to configure.])
fi
AC_DEFINE(NO_MP3_SUPPORT, 1, [MP3 support not available])
fi
AM_CONDITIONAL(HAVE_MP3, test "$have_mad" = "yes" )
SM_AUDIO
AC_SEARCH_LIBS(avcodec_init, [avcodec], have_libavcodec=yes, have_libavcodec=no)
AC_SEARCH_LIBS(guess_format, [avformat], have_libavformat=yes, have_libavformat=no)