From f8f5d40532067af6f3251ef8d63c235d1e9b00df Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 25 Jun 2009 11:29:08 +0200 Subject: NEWS: updated NEWS file for 0.15.1 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 47adedd07..1d793dddb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.1~git, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3 From d820a893ccc765388ed69de4aed3ff842c53c55c Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 25 Jun 2009 11:29:51 +0200 Subject: configure.ac: fix the --disable-ffmpeg help text --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1d793dddb..ebf08cb8f 100644 --- a/configure.ac +++ b/configure.ac @@ -398,7 +398,7 @@ AC_ARG_ENABLE(audiofile, AC_ARG_ENABLE(ffmpeg, AS_HELP_STRING([--disable-ffmpeg], - [enable FFMPEG support (default: enable)]),, + [disable FFMPEG support (default: enable)]),, enable_ffmpeg=yes) AC_ARG_ENABLE(flac, -- cgit v1.2.3 From 0c1c753e23c06c0fb8cf7287138fc2776cfe538f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 14 Jul 2009 14:23:49 +0200 Subject: configure.ac: fail when ffmpeg is enabled, but not found --- configure.ac | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index ebf08cb8f..aca0743c7 100644 --- a/configure.ac +++ b/configure.ac @@ -397,9 +397,9 @@ AC_ARG_ENABLE(audiofile, enable_audiofile=yes) AC_ARG_ENABLE(ffmpeg, - AS_HELP_STRING([--disable-ffmpeg], - [disable FFMPEG support (default: enable)]),, - enable_ffmpeg=yes) + AS_HELP_STRING([--enable-ffmpeg], + [enable FFMPEG support]),, + enable_ffmpeg=auto) AC_ARG_ENABLE(flac, AS_HELP_STRING([--disable-flac], @@ -914,10 +914,8 @@ fi AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes) -if test x$enable_ffmpeg = xyes; then - PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],, - enable_ffmpeg=no) -fi +MPD_AUTO_PKG(ffmpeg, FFMPEG, [libavformat libavcodec libavutil], + [ffmpeg decoder library], [libavformat+libavcodec+libavutil not found]) if test x$enable_ffmpeg = xyes; then old_LIBS=$LIBS -- cgit v1.2.3 From d7bad6ae020ffabfd5d2ae9d2ce723e67e999077 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Wed, 15 Jul 2009 13:36:41 -0700 Subject: mpd version 0.15.1 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index aca0743c7..3f631d238 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.60) -AC_INIT(mpd, 0.15.1~git, musicpd-dev-team@lists.sourceforge.net) +AC_INIT(mpd, 0.15.1, musicpd-dev-team@lists.sourceforge.net) AC_CONFIG_SRCDIR([src/main.c]) AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2]) AM_CONFIG_HEADER(config.h) -- cgit v1.2.3