Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 104975 | Differences between
and this patch

Collapse All | Expand All

(-)configure.in.old (-15 / +21 lines)
Lines 76-94 Link Here
76
		     [EXTRA_LIBS="$EXTRA_LIBS -lossaudio"])
76
		     [EXTRA_LIBS="$EXTRA_LIBS -lossaudio"])
77
fi
77
fi
78
78
79
PKG_CHECK_MODULES(ALSA, [alsa >= 0.9],
79
AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.))
80
	     [COMPILE_ALSA="yes"
80
81
	      EXTRA_OBJS="$EXTRA_OBJS alsa.o"
81
if test "$with_jack" != "xno"
82
	      AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA.])
82
then
83
	      EXTRA_LIBS="$EXTRA_LIBS $ALSA_LIBS"
83
	PKG_CHECK_MODULES([ALSA], [alsa >= 0.9],
84
	      CFLAGS="$CFLAGS $ALSA_CFLAGS"],
84
		     [COMPILE_ALSA="yes"
85
	     [COMPILE_ALSA="no"])
85
		     EXTRA_OBJS="$EXTRA_OBJS alsa.o"
86
	             AC_DEFINE([HAVE_ALSA], 1, [Define if you have ALSA.])
87
	             EXTRA_LIBS="$EXTRA_LIBS $ALSA_LIBS"
88
	             CFLAGS="$CFLAGS $ALSA_CFLAGS"],
89
	             [COMPILE_ALSA="no"])
90
else
91
	COMPILE_ALSA="no"
92
fi
86
93
87
AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.))
94
AC_ARG_WITH(jack, AS_HELP_STRING(--without-jack, Compile without JACK support.))
88
95
89
if test "x$with_jack" != "xno"
96
if test "x$with_jack" != "xno"
90
then
97
then
91
	PKG_CHECK_MODULES(JACK, [jack >= 0.4],
98
	PKG_CHECK_MODULES([JACK], [jack >= 0.4],
92
			  [COMPILE_JACK="yes"
99
			  [COMPILE_JACK="yes"
93
			   EXTRA_OBJS="$EXTRA_OBJS jack.o"
100
			   EXTRA_OBJS="$EXTRA_OBJS jack.o"
94
			   AC_DEFINE([HAVE_JACK], 1, [Define if you have JACK.])
101
			   AC_DEFINE([HAVE_JACK], 1, [Define if you have JACK.])
Lines 214-222 Link Here
214
			taglib_ver_minor=`echo "$taglib_ver" | awk -F. '{print $2}'`
221
			taglib_ver_minor=`echo "$taglib_ver" | awk -F. '{print $2}'`
215
			taglib_ver_extra=`echo "$taglib_ver" | awk -F. '{print $3}'`
222
			taglib_ver_extra=`echo "$taglib_ver" | awk -F. '{print $3}'`
216
223
217
			if test \( "$taglib_ver_major" = "1" -a "$taglib_ver_minor" -ge 4 \) \
224
			if test \( "$taglib_ver_major" = "1" -a \
218
				-o \( "$taglib_ver_major" = "1" -a "$taglib_ver_minor" = "3" \
225
			"$taglib_ver_minor" -ge 4 \) 
219
				-a "$taglib_ver_extra" -ge 1 \)
220
			then
226
			then
221
				AC_MSG_RESULT([$taglib_ver, OK])
227
				AC_MSG_RESULT([$taglib_ver, OK])
222
228
Lines 248-254 Link Here
248
AC_ARG_WITH(ogg, AS_HELP_STRING(--without-ogg,Compile without OGG support.))
254
AC_ARG_WITH(ogg, AS_HELP_STRING(--without-ogg,Compile without OGG support.))
249
if test "x$with_ogg" != "xno"
255
if test "x$with_ogg" != "xno"
250
then
256
then
251
	PKG_CHECK_MODULES(OGG_VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
257
	PKG_CHECK_MODULES([OGG_VORBIS], [ogg >= 1.0 vorbis >= 1.0 vorbisfile >= 1.0],
252
			  [AC_SUBST(OGG_VORBIS_LIBS)
258
			  [AC_SUBST(OGG_VORBIS_LIBS)
253
			  AC_SUBST(OGG_VORBIS_CFLAGS)
259
			  AC_SUBST(OGG_VORBIS_CFLAGS)
254
			  DECODER_PLUGINS="$DECODER_PLUGINS ogg"],
260
			  DECODER_PLUGINS="$DECODER_PLUGINS ogg"],
Lines 269-275 Link Here
269
	    Compile without libsndfile))
275
	    Compile without libsndfile))
270
if test "x$with_sndfile" != "xno"
276
if test "x$with_sndfile" != "xno"
271
then
277
then
272
	PKG_CHECK_MODULES(sndfile, sndfile >= 1.0.0,
278
	PKG_CHECK_MODULES([sndfile], [sndfile >= 1.0.0],
273
			   [AC_SUBST(sndfile_LIBS)
279
			   [AC_SUBST(sndfile_LIBS)
274
			   AC_SUBST(sndfile_CFLAGS)
280
			   AC_SUBST(sndfile_CFLAGS)
275
			   DECODER_PLUGINS="$DECODER_PLUGINS sndfile"],
281
			   DECODER_PLUGINS="$DECODER_PLUGINS sndfile"],
Lines 281-287 Link Here
281
	    Compile without speex support))
287
	    Compile without speex support))
282
if test "x$with_speex" != "xno"
288
if test "x$with_speex" != "xno"
283
then
289
then
284
	PKG_CHECK_MODULES(speex, speex >= 1.0.0,
290
	PKG_CHECK_MODULES([speex], [speex >= 1.0.0],
285
			  [AC_SUBST(speex_LIBS)
291
			  [AC_SUBST(speex_LIBS)
286
			  AC_SUBST(speex_CFLAGS)
292
			  AC_SUBST(speex_CFLAGS)
287
			  DECODER_PLUGINS="$DECODER_PLUGINS speex"],
293
			  DECODER_PLUGINS="$DECODER_PLUGINS speex"],
Lines 294-300 Link Here
294
COMPILE_SAMPLERATE="no"
300
COMPILE_SAMPLERATE="no"
295
if test "x$with_samplerate" != "xno"
301
if test "x$with_samplerate" != "xno"
296
then
302
then
297
	PKG_CHECK_MODULES(samplerate, samplerate >= 0.1.0,
303
	PKG_CHECK_MODULES([samplerate], [samplerate >= 0.1.0],
298
			  [EXTRA_LIBS="$EXTRA_LIBS $samplerate_LIBS"
304
			  [EXTRA_LIBS="$EXTRA_LIBS $samplerate_LIBS"
299
			   CFLAGS="$CFLAGS $samplerate_CFLAGS"
305
			   CFLAGS="$CFLAGS $samplerate_CFLAGS"
300
			   AC_DEFINE([HAVE_SAMPLERATE], 1,
306
			   AC_DEFINE([HAVE_SAMPLERATE], 1,

Return to bug 104975