X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=f85285ab5099c99f87cb2ed42ffdd729d77f3ad0;hb=ed1cab1d6cbde6129bbd09b9609f7bba03ab610f;hp=e5923f7abe291c262dd8d146f1e84e921c3f1e3c;hpb=23f5d8ff7bc647705baa611e9a887e24405908d8;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index e5923f7a..f85285ab 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -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" @@ -678,7 +680,9 @@ echo "" # build extras if test "x$HAVE_tiff" = "xyes"; then - EXTRA_LIBS+=' -ljbig' + if test "x$HAVE_jbig" = "xyes"; then + EXTRA_LIBS+=' -ljbig' + fi fi if test "x$HAVE_NUMA" = "xyes"; then EXTRA_LIBS+=' -lnuma' @@ -797,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 +