On Tue, Oct 11, 2016 at 6:35 PM, Michael Bradshaw <mjbs...@gmail.com> wrote: > > On Tue, Oct 11, 2016 at 11:37 AM, Andreas Cadhalpun < > andreas.cadhal...@googlemail.com> wrote: >> >> + check_lib2 openjpeg-2.1/openjpeg.h >> opj_version -lopenjp2 || >> + { check_lib openjpeg-2.0/openjpeg.h >> opj_version -lopenjp2 -DOPJ_STATIC && add_cflags -DOPJ_STATIC; } || >> > > You can drop the changes for v2.0 and below. Only v2.1 needs the check. > The new OPJ_STATIC behavior was introduced in OpenJPEG v2.1.1. >
Gah, this comment wasn't very clear. I mean that all the checks for v2.0 and below should have -DOPJ_STATIC && add_cppflags -DOPJ_STATIC. Only v2.1 needs to worry about possibly not using OPJ_STATIC. > + check_lib2 openjpeg-2.0/openjpeg.h >> opj_version -lopenjp2 || >> + { check_lib openjpeg-1.5/openjpeg.h >> opj_version -lopenjpeg -DOPJ_STATIC && add_cflags -DOPJ_STATIC; } || >> + check_lib2 openjpeg-1.5/openjpeg.h >> opj_version -lopenjpeg || > > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel