file probe prefs, updated dcraw, bugs - garbage, accel, ffmpeg/giphy.gif

[goodguy/history.git] / cinelerra-5.1 / configure.ac

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index da5aadec94318d8275513c2902f7714e361be8fb..f85285ab5099c99f87cb2ed42ffdd729d77f3ad0 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -294,12 +294,12 @@ PKG_3RD([twolame],[auto],
   [  libtwolame ])
 
 PKG_3RD([x264],[auto],
-  [x264-snapshot-20170416-2245-stable],
+  [x264-snapshot-20170426-2245],
   [ libx264.a ],
   [ . ])
 
 PKG_3RD([x265],[auto],
-  [x265_2.3],
+  [x265_2.4],
   [ libx265.a ],
   [ . source ])
 
@@ -445,6 +445,8 @@ CHECK_LIB([giflib], [gif], [DGifOpen])
 CHECK_HEADERS([giflib], [gif lib headers], [gif_lib.h])
 CHECK_LIB([fdk], [fdk-aac], [faacDecInit])
 CHECK_HEADERS([fdk], [fdk headers], [fdk-aac/genericStds.h])
+CHECK_LIB([jbig], [jbig], [jbg_dec_init])
+CHECK_LIB([vdpau], [vdpau], [vdp_device_create_x11])
 
 #if test "x$HAVE_mjpegtools" = "xyes"; then
 #CFG_CFLAGS+=" -I/usr/include/mjpegtools"
@@ -677,6 +679,11 @@ echo "  using: ladspa-build = $WANT_LADSPA_BUILD"
 echo ""
 
 # build extras
+if test "x$HAVE_tiff" = "xyes"; then
+  if test "x$HAVE_jbig" = "xyes"; then
+    EXTRA_LIBS+=' -ljbig'
+  fi
+fi
 if test "x$HAVE_NUMA" = "xyes"; then
   EXTRA_LIBS+=' -lnuma'
 fi
@@ -794,3 +801,10 @@ echo ""
 echo "export thirdparty_libraries libraries"
 echo "export CFLAGS_ CXXFLAGS_ LDFLAGS_"
 echo "unexport CFLAGS CXXFLAGS LDFLAGS"
+
+if test "x$HAVE_tiff" = "xyes"; then
+  if test "x$HAVE_jbig" != "xyes"; then
+    echo "tiff.cfg_params+= --disable-jbig"
+  fi
+fi
+