git-svn-id: file:///srv/caca.zoy.org/var/lib/svn/libpipi/trunk@3346 92316355-f0b4-4df1-b90c-862c8a59935fmaster
| @@ -212,6 +212,13 @@ if test "${enable_csharp}" != "no"; then | |||||
| fi | fi | ||||
| AM_CONDITIONAL(USE_CSHARP, test "${ac_cv_my_have_csharp}" = "yes") | AM_CONDITIONAL(USE_CSHARP, test "${ac_cv_my_have_csharp}" = "yes") | ||||
| # Build the movie thumbnailer? | |||||
| ac_cv_my_have_ffmpeg="yes" | |||||
| PKG_CHECK_MODULES([LIBAVCODEC], [libavcodec], [:], [ac_cv_my_have_ffmpeg=no]) | |||||
| PKG_CHECK_MODULES([LIBAVFORMAT], [libavformat], [:], [ac_cv_my_have_ffmpeg=no]) | |||||
| PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [:], [ac_cv_my_have_ffmpeg=no]) | |||||
| AM_CONDITIONAL(USE_FFMPEG, test "${ac_cv_my_have_ffmpeg}" = "yes") | |||||
| # Build The Pimp? | # Build The Pimp? | ||||
| ac_cv_my_have_gtksharp="${ac_cv_my_have_csharp}" | ac_cv_my_have_gtksharp="${ac_cv_my_have_csharp}" | ||||
| PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no]) | PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no]) | ||||
| @@ -3,7 +3,7 @@ | |||||
| AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/pipi -I../pipi | AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/pipi -I../pipi | ||||
| noinst_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram \ | noinst_PROGRAMS = edd img2rubik sharpen floodfill line bezier histogram \ | ||||
| colorstring storyboard | |||||
| colorstring $(storyboard) | |||||
| edd_SOURCES = edd.c | edd_SOURCES = edd.c | ||||
| edd_LDADD = ../pipi/libpipi.la | edd_LDADD = ../pipi/libpipi.la | ||||
| @@ -29,8 +29,11 @@ histogram_LDADD = ../pipi/libpipi.la | |||||
| colorstring_SOURCES = colorstring.c | colorstring_SOURCES = colorstring.c | ||||
| colorstring_LDADD = ../pipi/libpipi.la | colorstring_LDADD = ../pipi/libpipi.la | ||||
| if USE_FFMPEG | |||||
| storyboard = storyboard | |||||
| endif | |||||
| storyboard_SOURCES = storyboard.c | storyboard_SOURCES = storyboard.c | ||||
| storyboard_LDADD = ../pipi/libpipi.la | storyboard_LDADD = ../pipi/libpipi.la | ||||
| storyboard_CFLAGS = `pkg-config --cflags libavformat libavcodec libswscale` | |||||
| storyboard_LDFLAGS = `pkg-config --libs libavformat libavcodec libswscale` | |||||
| storyboard_CFLAGS = $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS) | |||||
| storyboard_LDFLAGS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS) | |||||