diff options
| -rw-r--r-- | m4/vorbis.m4 | 56 |
1 files changed, 35 insertions, 21 deletions
diff --git a/m4/vorbis.m4 b/m4/vorbis.m4 index 417bb66a..73e3b43a 100644 --- a/m4/vorbis.m4 +++ b/m4/vorbis.m4 @@ -1,6 +1,7 @@ # Configure paths for libvorbis # Jack Moffitt <jack@icecast.org> 10-21-2000 # Shamelessly stolen from Owen Taylor and Manish Singh +# thomasvs added check for vorbis_bitrate_addblock which is new in rc3 dnl AM_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS @@ -9,29 +10,31 @@ AC_DEFUN(AM_PATH_VORBIS, [dnl dnl Get the cflags and libraries dnl -AC_ARG_WITH(vorbis-prefix, - AC_HELP_STRING([--with-vorbis-prefix=PFX], - [prefix where libvorbis is installed (optional)]), - vorbis_prefix="$withval", vorbis_prefix="") +AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") +AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="") +AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="") +AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) -AC_ARG_ENABLE(vorbistest, - AC_HELP_STRING([--disable-vorbistest], - [do not try to compile and run a test Vorbis program]), - , enable_vorbistest=yes) + if test "x$vorbis_libraries" != "x" ; then + VORBIS_LIBS="-L$vorbis_libraries" + elif test "x$vorbis_prefix" != "x" ; then + VORBIS_LIBS="-L$vorbis_prefix/lib" + elif test "x$prefix" != "xNONE"; then + VORBIS_LIBS="-L$prefix/lib" + fi + + VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm" + VORBISFILE_LIBS="-lvorbisfile" + VORBISENC_LIBS="-lvorbisenc" - if test "x$vorbis_prefix" != "xNONE" ; then - vorbis_args="$vorbis_args --prefix=$vorbis_prefix" + if test "x$vorbis_includes" != "x" ; then + VORBIS_CFLAGS="-I$vorbis_includes" + elif test "x$vorbis_prefix" != "x" ; then VORBIS_CFLAGS="-I$vorbis_prefix/include" - VORBIS_LIBDIR="-L$vorbis_prefix/lib" - elif test "$prefix" != ""; then - vorbis_args="$vorbis_args --prefix=$prefix" + elif test "x$prefix" != "xNONE"; then VORBIS_CFLAGS="-I$prefix/include" - VORBIS_LIBDIR="-L$prefix/lib" fi - VORBIS_LIBS="$VORBIS_LIBDIR -lvorbis -lm" - VORBISFILE_LIBS="-lvorbisfile" - VORBISENC_LIBS="-lvorbisenc" AC_MSG_CHECKING(for Vorbis) no_vorbis="" @@ -40,8 +43,8 @@ AC_ARG_ENABLE(vorbistest, if test "x$enable_vorbistest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $VORBIS_CFLAGS" - LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS" + CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS" + LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS" dnl dnl Now check if the installed Vorbis is sufficiently new. dnl @@ -54,8 +57,19 @@ dnl int main () { - system("touch conf.vorbistest"); - return 0; + vorbis_block vb; + vorbis_dsp_state vd; + vorbis_info vi; + + vorbis_info_init (&vi); + vorbis_encode_init (&vi, 2, 44100, -1, 128, -1); + vorbis_analysis_init (&vd, &vi); + vorbis_block_init (&vd, &vb); + /* this function was added in 1.0rc3, so this is what we're testing for */ + vorbis_bitrate_addblock (&vb); + + system("touch conf.vorbistest"); + return 0; } ],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) |