diff options
| author |  Viktor Semykin <thesame.ml@gmail.com> | 2010-01-19 00:25:48 +0200 |
|---|---|---|
| committer | Viktor Semykin <thesame.ml@gmail.com> | 2010-01-19 00:25:48 +0200 |
| commit | b07cca605c3686199cadbc797a083b99bce14d5f (patch) | |
| tree | de25936c9eb92c49bd3008623fcfd572c57f7a6a /configure.ac | |
| parent | 380065e39d0a8c097569b6705530b68f1abf7ed2 (diff) | |
| parent | 583b601c6420b43e0ecbb86faf44ab1e52f95064 (diff) | |
Merge branch 'master' of git://deadbeef.git.sourceforge.net/gitroot/deadbeef/deadbeef into notify
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6c6f4e2e..80ff9970 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT AC_CONFIG_HEADER(config.h) PACKAGE="deadbeef" -VERSION="0.3.2-pre" +VERSION="0.3.2" AM_INIT_AUTOMAKE($PACKAGE,$VERSION) @@ -36,13 +36,15 @@ esac test "x$prefix" = xNONE && prefix=$ac_default_prefix INSANE_CFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits -Wbad-function-cast" +INSANE_CXXFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-value -Wuninitialized -Wtype-limits" -CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\"" +CXXFLAGS="$CXXFLAGS $INSANE_CXXFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\"" +CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\"" PKG_CHECK_MODULES(DEPS, samplerate) PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=1, NO_GTK=1) PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=1, NO_ALSA=1) -PKG_CHECK_MODULES(FFMPEG_DEPS, libavcodec libavutil libavformat >= 52.0.0, HAVE_FFMPEG=1, NO_FFMPEG=1) +PKG_CHECK_MODULES(FFMPEG_DEPS, libavcodec >= 51.0.0 libavutil libavformat >= 52.0.0, HAVE_FFMPEG=1, NO_FFMPEG=1) AC_CHECK_LIB([pthread], [main]) AC_CHECK_LIB([dl], [main]) @@ -166,6 +168,8 @@ fi AM_CONDITIONAL(HAVE_FFMPEG, test $HAVE_FFMPEG) if test ${HAVE_FFMPEG}; then + dnl check headers + AC_CHECK_HEADER([ffmpeg/avformat.h], FFMPEG_DEPS_CFLAGS="$FFMPEG_DEPS_CFLAGS -D FFMPEG_OLD") FFMPEG_DIR="plugins/ffmpeg" AC_SUBST(FFMPEG_DEPS_CFLAGS) AC_SUBST(FFMPEG_DEPS_LIBS) |