X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=9c69fa0126d64bfae984ce9b99a7e847d7c05651;hp=9f92fca3e070af793b3dd6762a9b82b51899a626;hb=7c199a42936462d662ee405fe0b4df5ac74850dc;hpb=6fd57106820e676e368399d16b925bdc78d34621

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9f92fca3..9c69fa01 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -13,8 +13,8 @@ CFG_CFLAGS+=" -pthread -Wall -Wno-unused-result"
 CFG_CFLAGS+=" -D__STDC_CONSTANT_MACROS"
 CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
-CFG_CFLAGS+=" -I/usr/include/freetype2"
 CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+CFG_CFLAGS+=" -I/usr/include/freetype2"
 
 AC_DEFUN([CHECK_WITH], [
 AC_ARG_WITH([$1],
@@ -97,7 +97,7 @@ PKG_3RD([a52dec],[yes],
 
 PKG_3RD([djbfft],[yes],
   [djbfft-0.76],
-  [ djbfft.a ],
+  [ libdjbfft.a ],
   [ . ])
 
 PKG_3RD([audiofile],[no],
@@ -135,7 +135,7 @@ PKG_3RD([fdk],[auto],
   [ libAACdec/include libAACenc/include libSYS/include ])
 
 PKG_3RD([ffmpeg],[yes],
-  [ffmpeg-3.1.2],
+  [ffmpeg-3.1.4],
   [ libavutil/libavutil.a \
     libavcodec/libavcodec.a \
     libpostproc/libpostproc.a \
@@ -228,7 +228,7 @@ PKG_3RD([libjpeg],[auto],
     simd/.libs/libsimd.a ],
   [ . ])
 
-PKG_3RD([openjpeg],[yes],
+PKG_3RD([openjpeg],[auto],
   [openjpeg-2.1.0-20160221],
   [ bin/libopenjp2.a ],
   [ src/lib/openjp2 ])
@@ -303,13 +303,13 @@ PKG_3RD([twolame],[auto],
   [ libtwolame/.libs/libtwolame.a ],
   [  libtwolame ])
 
-PKG_3RD([x264],[yes],
+PKG_3RD([x264],[auto],
   [x264-snapshot-20160220-2245-stable],
   [ libx264.a ],
   [ . ])
 
-PKG_3RD([x265],[yes],
-  [x265_2.0],
+PKG_3RD([x265],[auto],
+  [x265_2.1],
   [ libx265.a ],
   [ . source ])
 
@@ -423,7 +423,7 @@ CHECK_LIB([libjpeg], [jpeg], [jpeg_start_decompress])
 CHECK_HEADERS([libjpeg], [jpeg headers], [stdio.h jpeglib.h])
 CHECK_LIB([libogg], [ogg], [ogg_stream_init])
 CHECK_HEADERS([libogg], [ogg headers], [ogg/ogg.h])
-CHECK_LIB([openjpeg], [openjpeg], [opj_version])
+CHECK_LIB([openjpeg], [openjp2], [opj_version])
 CHECK_HEADERS([openjpeg], [openjpeg headers], [openjpeg.h])
 CHECK_LIB([libsndfile], [sndfile], [sf_open])
 CHECK_HEADERS([libsndfile], [sndfile headers], [sndfile.h])
@@ -437,6 +437,8 @@ CHECK_LIB([libvorbis], [vorbisfile], [ov_open])
 CHECK_HEADERS([libvorbis], [vorbis file headers], [vorbis/vorbisfile.h])
 CHECK_LIB([libvpx], [vpx], [vpx_codec_decode])
 CHECK_HEADERS([libvpx], [vpx headers], [vpx/vpx_decoder.h])
+CHECK_LIB([mjpegtools], [mjpegutils], [mjpeg_info])
+CHECK_HEADERS([mjpegtools], [mjpegtools headers], [mjpegtools/mjpeg_types.h])
 CHECK_LIB([tiff], [tiff], [TIFFOpen])
 CHECK_HEADERS([tiff], [tiff headers], [tiff.h tiffio.h])
 CHECK_LIB([twolame], [twolame], [twolame_encode_buffer_float32_interleaved])
@@ -458,6 +460,9 @@ CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
 CHECK_LIB([fdk], [fdk-aac], [faacDecInit])
 CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h])
 
+#if test "x$HAVE_mjpegtools" = "xyes"; then
+#CFG_CFLAGS+=" -I/usr/include/mjpegtools"
+#fi
 
 AC_DEFUN([CHECK_WANT], [
 RESULT=yes
@@ -591,14 +596,13 @@ AC_DEFUN([PKG_FORCED],[PKG_STATIC([$1],[forced])])
 # order matters
 for dep in \
         ffmpeg/faac ffmpeg/faad2 ffmpeg/twolame ffmpeg/lame ffmpeg/openjpeg \
-        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/fdk \
+        ffmpeg/libvorbis ffmpeg/libtheora ffmpeg/x264 ffmpeg/x265 ffmpeg/fdk \
         libiec61883/libraw1394 libavc1394/librom1394 \
         openexr/ilmbase ilmbase/libogg \
         libtheora/libogg libtheora/libvorbis ; do
-  lib=`dirname $dep`
-  eval pkg_lib="\$PKG_$lib"; eval have_lib="\$HAVE_$lib";
-  if test "x$pkg_lib" != "xno" ; then
-    needs=`basename $dep`
+  lib=`dirname $dep`;  needs=`basename $dep`
+  eval pkg_lib="\$PKG_$lib"; eval needs_lib="\$HAVE_$needs";
+  if test "x$pkg_lib" != "xno" -a "x$needs_lib" != "xyes" ; then
     eval "PKG_$needs=yes"
   fi
 done