CFG_CFLAGS+=" -DPNG_SKIP_SETJMP_CHECK=1"
CFG_CFLAGS+=" -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
CFG_CFLAGS+=" -I/usr/include/freetype2"
+CFG_CFLAGS+=" -I/usr/include/OpenEXR"
AC_DEFUN([CHECK_WITH], [
AC_ARG_WITH([$1],
simd/.libs/libsimd.a ],
[ . ])
-PKG_3RD([openjpeg],[yes],
+PKG_3RD([openjpeg],[auto],
[openjpeg-2.1.0-20160221],
[ bin/libopenjp2.a ],
[ src/lib/openjp2 ])
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])
libtheora/libogg libtheora/libvorbis ; do
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
+ if test "x$pkg_lib" != "xno"; then
eval "PKG_$needs=yes"
fi
done
AC_SUBST(WANT_X264_HIDEPTH)
AC_SUBST(WANT_X265_HIDEPTH)
-if test "x$BUILD_openexr" = "x0"; then
- CFG_CFLAGS+=" -I/usr/include/OpenEXR"
-fi
-
AC_SUBST(CFG_CFLAGS)
AC_SUBST(CFG_CXXFLAGS)