View | Details | Raw Unified
Collapse All | Expand All

(-) configure.in.old (-15 / +21 lines)
 Lines 76-94    Link Here 
		     [EXTRA_LIBS="$EXTRA_LIBS -lossaudio"])
		     [EXTRA_LIBS="$EXTRA_LIBS -lossaudio"])
fi
fi
PKG_CHECK_MODULES(ALSA, [alsa >= 0.9],
AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.))
	     [COMPILE_ALSA="yes"
	      EXTRA_OBJS="$EXTRA_OBJS alsa.o"
if test "$with_jack" != "xno"
	      AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA.])
then
	      EXTRA_LIBS="$EXTRA_LIBS $ALSA_LIBS"
	PKG_CHECK_MODULES([ALSA], [alsa >= 0.9],
	      CFLAGS="$CFLAGS $ALSA_CFLAGS"],
		     [COMPILE_ALSA="yes"
	     [COMPILE_ALSA="no"])
		     EXTRA_OBJS="$EXTRA_OBJS alsa.o"
	             AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA.])
	             EXTRA_LIBS="$EXTRA_LIBS $ALSA_LIBS"
	             CFLAGS="$CFLAGS $ALSA_CFLAGS"],
	             [COMPILE_ALSA="no"])
else
	COMPILE_ALSA="no"
fi
AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.))
AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.))
if test "x$with_jack" != "xno"
if test "x$with_jack" != "xno"
then
then
	PKG_CHECK_MODULES(JACK, [jack >= 0.4],
	PKG_CHECK_MODULES([JACK], [jack >= 0.4],
			  [COMPILE_JACK="yes"
			  [COMPILE_JACK="yes"
			   EXTRA_OBJS="$EXTRA_OBJS jack.o"
			   EXTRA_OBJS="$EXTRA_OBJS jack.o"
			   AC_DEFINE([HAVE_JACK], 1, [Define if you have JACK.])
			   AC_DEFINE([HAVE_JACK], 1, [Define if you have JACK.])
 Lines 214-222    Link Here 
			taglib_ver_minor=`echo "$taglib_ver" | awk -F. '{print $2}'`
			taglib_ver_minor=`echo "$taglib_ver" | awk -F. '{print $2}'`
			taglib_ver_extra=`echo "$taglib_ver" | awk -F. '{print $3}'`
			taglib_ver_extra=`echo "$taglib_ver" | awk -F. '{print $3}'`
			if test \( "$taglib_ver_major" = "1" -a "$taglib_ver_minor" -ge 4 \) \
			if test \( "$taglib_ver_major" = "1" -a \
				-o \( "$taglib_ver_major" = "1" -a "$taglib_ver_minor" = "3" \
			"$taglib_ver_minor" -ge 4 \) 
				-a "$taglib_ver_extra" -ge 1 \)
			then
			then
				AC_MSG_RESULT([$taglib_ver, OK])
				AC_MSG_RESULT([$taglib_ver, OK])
 Lines 248-254    Link Here 
AC_ARG_WITH(ogg, AS_HELP_STRING(--without-ogg,Compile without OGG support.))
AC_ARG_WITH(ogg, AS_HELP_STRING(--without-ogg,Compile without OGG support.))
if test "x$with_ogg" != "xno"
if test "x$with_ogg" != "xno"
then
then
	PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
	PKG_CHECK_MODULES([OGG_VORBIS], [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
			  [AC_SUBST(OGG_VORBIS_LIBS)
			  [AC_SUBST(OGG_VORBIS_LIBS)
			  AC_SUBST(OGG_VORBIS_CFLAGS)
			  AC_SUBST(OGG_VORBIS_CFLAGS)
			  DECODER_PLUGINS="$DECODER_PLUGINS ogg"],
			  DECODER_PLUGINS="$DECODER_PLUGINS ogg"],
 Lines 269-275    Link Here 
	    Compile without libsndfile))
	    Compile without libsndfile))
if test "x$with_sndfile" != "xno"
if test "x$with_sndfile" != "xno"
then
then
	PKG_CHECK_MODULES(sndfile, sndfile >= 1.0.0,
	PKG_CHECK_MODULES([sndfile], [sndfile >= 1.0.0],
			   [AC_SUBST(sndfile_LIBS)
			   [AC_SUBST(sndfile_LIBS)
			   AC_SUBST(sndfile_CFLAGS)
			   AC_SUBST(sndfile_CFLAGS)
			   DECODER_PLUGINS="$DECODER_PLUGINS sndfile"],
			   DECODER_PLUGINS="$DECODER_PLUGINS sndfile"],
 Lines 281-287    Link Here 
	    Compile without speex support))
	    Compile without speex support))
if test "x$with_speex" != "xno"
if test "x$with_speex" != "xno"
then
then
	PKG_CHECK_MODULES(speex, speex >= 1.0.0,
	PKG_CHECK_MODULES([speex], [speex >= 1.0.0],
			  [AC_SUBST(speex_LIBS)
			  [AC_SUBST(speex_LIBS)
			  AC_SUBST(speex_CFLAGS)
			  AC_SUBST(speex_CFLAGS)
			  DECODER_PLUGINS="$DECODER_PLUGINS speex"],
			  DECODER_PLUGINS="$DECODER_PLUGINS speex"],
 Lines 294-300    Link Here 
COMPILE_SAMPLERATE="no"
COMPILE_SAMPLERATE="no"
if test "x$with_samplerate" != "xno"
if test "x$with_samplerate" != "xno"
then
then
	PKG_CHECK_MODULES(samplerate, samplerate >= 0.1.0,
	PKG_CHECK_MODULES([samplerate], [samplerate >= 0.1.0],
			  [EXTRA_LIBS="$EXTRA_LIBS $samplerate_LIBS"
			  [EXTRA_LIBS="$EXTRA_LIBS $samplerate_LIBS"
			   CFLAGS="$CFLAGS $samplerate_CFLAGS"
			   CFLAGS="$CFLAGS $samplerate_CFLAGS"
			   AC_DEFINE([HAVE_SAMPLERATE], 1,
			   AC_DEFINE([HAVE_SAMPLERATE], 1,