From 44b4b509499f7d5068a313f3ce9391bc6092f791 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sun, 9 Jan 2011 18:00:12 -0800 Subject: Modify version string to post-release version 0.16.2~git --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c8a568ab4..a1e310575 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.16.1, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.16.2~git, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3 From 5735c9efc1e9980a61c9ab779f138ea0409801e4 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 28 Jan 2011 12:21:03 +0100 Subject: configure.ac: fix tremor configure test When the configure options were moved around for 0.16, the order was changed, and the Tremor check broke. --- configure.ac | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a1e310575..4fafb1899 100644 --- a/configure.ac +++ b/configure.ac @@ -934,13 +934,19 @@ if test x$enable_tremor = xyes; then ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $TREMOR_CFLAGS" LIBS="$LIBS $TREMOR_LIBS" - AC_CHECK_LIB(vorbisidec,ov_read,enable_vorbis=yes,enable_vorbis=no; + AC_CHECK_LIB(vorbisidec,ov_read,,enable_tremor=no; AC_MSG_WARN([vorbisidec lib needed for ogg support with tremor -- disabling ogg support])) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" +fi +if test x$enable_tremor = xyes; then AC_DEFINE(HAVE_TREMOR,1, [Define to use tremor (libvorbisidec) for ogg support]) + AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support]), +else + TREMOR_CFLAGS= + TREMOR_LIBS= fi AC_SUBST(TREMOR_CFLAGS) @@ -980,7 +986,7 @@ if test x$enable_vorbis = xyes; then fi fi -AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes) +AM_CONDITIONAL(ENABLE_VORBIS_DECODER, test x$enable_vorbis = xyes || test x$enable_tremor = xyes) dnl --------------------------------- sidplay --------------------------------- found_sidplay=$HAVE_CXX -- cgit v1.2.3 From 5779146a7feed41f107b3865226134579a66135a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20Sp=C3=B6rlein?= Date: Tue, 8 Feb 2011 05:44:00 +0100 Subject: configure.ac: fix bashism in tremor test This makes FreeBSD detect libogg correctly. The '==' operator is an undocumented GNU extension to test(1) and cannot be relied upon to exist and do the right thing. POSIX mandates string comparisons to be done using "test foo = bar". --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4fafb1899..52740b0f7 100644 --- a/configure.ac +++ b/configure.ac @@ -635,7 +635,7 @@ fi AM_CONDITIONAL(ENABLE_LASTFM, test x$enable_lastfm = xyes) dnl ---------------------------------- libogg --------------------------------- -if test x$with_tremor == xno || test -z $with_tremor; then +if test x$with_tremor = xno || test -z $with_tremor; then PKG_CHECK_MODULES(OGG, [ogg], enable_ogg=yes, enable_ogg=no) fi -- cgit v1.2.3 From fe588a255ba713875a21bb98d3b7daf60af2844e Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Fri, 18 Mar 2011 17:43:11 -0700 Subject: mpd version 0.16.2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 52740b0f7..6d0239f4a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.16.2~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.16.2, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.10 dist-bzip2 subdir-objects]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3