Changeset 3346


Ignore:
Timestamp:
Jan 13, 2009, 12:52:00 AM (12 years ago)
Author:
Sam Hocevar
Message:

Conditionally build the movie thumbnailer by detecting libavcodec et al.

Location:
libpipi/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/configure.ac

    r3343 r3346  
    212212fi
    213213AM_CONDITIONAL(USE_CSHARP, test "${ac_cv_my_have_csharp}" = "yes")
     214
     215# Build the movie thumbnailer?
     216ac_cv_my_have_ffmpeg="yes"
     217PKG_CHECK_MODULES([LIBAVCODEC], [libavcodec], [:], [ac_cv_my_have_ffmpeg=no])
     218PKG_CHECK_MODULES([LIBAVFORMAT], [libavformat], [:], [ac_cv_my_have_ffmpeg=no])
     219PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [:], [ac_cv_my_have_ffmpeg=no])
     220AM_CONDITIONAL(USE_FFMPEG, test "${ac_cv_my_have_ffmpeg}" = "yes")
    214221
    215222# Build The Pimp?
  • libpipi/trunk/examples/Makefile.am

    r3345 r3346  
    44
    55noinst_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram \
    6         colorstring storyboard
     6        colorstring $(storyboard)
    77
    88edd_SOURCES = edd.c
     
    3030colorstring_LDADD = ../pipi/libpipi.la
    3131
     32if USE_FFMPEG
     33storyboard = storyboard
     34endif
    3235storyboard_SOURCES = storyboard.c
    3336storyboard_LDADD = ../pipi/libpipi.la
    34 storyboard_CFLAGS = `pkg-config --cflags libavformat libavcodec libswscale`
    35 storyboard_LDFLAGS = `pkg-config --libs libavformat libavcodec libswscale`
     37storyboard_CFLAGS = $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS)
     38storyboard_LDFLAGS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS)
    3639
Note: See TracChangeset for help on using the changeset viewer.