← Back to branch summary

~kamalmostafa/ubuntu/lucid/mpd/fix-511454-ftbfs

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-02-16 20:53:49 UTC
  • mfrom: (1.1.11 upstream) (2.1.10 sid)
  • Revision ID: james.westby@ubuntu.com-20090216205349-aui8v0kpkxukz8pp
Tags: 0.14.2-2ubuntu1
* Merge from debian unstable, Ubuntu remaining changes:
  - debian/control: Move avahi-daemon from Suggests field to Recommends
    field.
  - debian/mpd.init.d: Read mpd user from mpd.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
AC_PREREQ(2.60)
2
 
AC_INIT(mpd, 0.14.1, musicpd-dev-team@lists.sourceforge.net)
 
2
AC_INIT(mpd, 0.14.2, musicpd-dev-team@lists.sourceforge.net)
3
3
AC_CONFIG_SRCDIR([src/main.c])
4
4
AM_INIT_AUTOMAKE([foreign 1.9 dist-bzip2])
5
5
AM_CONFIG_HEADER(config.h)
784
784
AM_CONDITIONAL(HAVE_MIKMOD, test x$enable_mod = xyes)
785
785
 
786
786
if test x$enable_ffmpeg = xyes; then
787
 
        PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],
788
 
                AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]),
 
787
        PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
789
788
                enable_ffmpeg=no)
790
789
fi
791
790
 
808
807
        CPPCFLAGS=$old_CPPFLAGS
809
808
fi
810
809
 
 
810
if test x$enable_ffmpeg = xyes; then
 
811
        AC_DEFINE(HAVE_FFMPEG, 1, [Define for FFMPEG support]),
 
812
fi
 
813
 
811
814
AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes)
812
815
 
813
816
case $with_zeroconf in