← Back to branch summary

~vanvugt/+junk/mediatomb

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc
  • Date: 2010-02-22 20:16:31 UTC
  • mfrom: (4.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100222201631-fgwswo4s4ogdr8x8
Tags: 0.12.0~svn2018-6ubuntu1
* Merge from debian unstable, Ubuntu remaining changes:
  - Add OR depends on abrowser.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1543
1543
    AC_SUBST(FFMPEG_LDFLAGS)
1544
1544
    AC_SUBST(FFMPEG_LIBS)
1545
1545
else
1546
 
    if test "x$FFMPEG_OPTIEON_REQUESTED" = xyes; then
 
1546
    if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
1547
1547
        AC_MSG_ERROR(unable to configure ffmpeg support)
1548
1548
    fi
1549
1549
fi
1551
1551
MT_CHECK_OPTIONAL_PACKAGE([ffmpegthumbnailer], [disable], 
1552
1552
        [compile with ffmpegthumbnailer support for video thumbnail generation],
1553
1553
        [libffmpegthumbnailer/videothumbnailerc], 
 
1554
        [ffmpegthumbnailer], [video_thumbnailer_create], [pass])
 
1555
 
 
1556
if (test "x$FFMPEGTHUMBNAILER_STATUS" != xyes); then
 
1557
    MT_CHECK_OPTIONAL_PACKAGE([ffmpegthumbnailer], [disable], 
 
1558
        [compile with ffmpegthumbnailer support for video thumbnail generation],
 
1559
        [libffmpegthumbnailer/videothumbnailerc], 
1554
1560
        [ffmpegthumbnailer], [create_thumbnailer])
1555
1561
 
 
1562
    if (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes); then
 
1563
        AC_DEFINE([FFMPEGTHUMBNAILER_OLD_API], [1], [use ffmpegthumbnailer API])
 
1564
    fi
 
1565
fi
 
1566
 
1556
1567
if ((test "x$FFMPEG_STATUS" != xyes) && (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes)); then
1557
1568
    if test "x$FFMPEGTHUMBNAILER_OPTION_REQUESTED" = xyes; then
1558
1569
      AC_MSG_ERROR([ffmpeg libraries are required in order to use ffmpegthumbnailer])