X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=1329c96ce93854f819a510841a0f0749c3a6f683;hb=929899524176aab570798f0708bad7f29a13ee5c;hp=1cf621b49cbcb95a0b8f4cc8dbf6ccc5c60f1c31;hpb=faaea1ce7a18979feba27c6e2127161995935a13;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 1cf621b4..1329c96c 100644 --- a/cinelerra-5.1/configure.ac +++ b/cinelerra-5.1/configure.ac @@ -6,12 +6,29 @@ AC_INIT([cinelerra],[5.1],[mail@lists.cinelerra-gg.org]) # externally. This macro must be set before calling AC_INIT_AUTOMAKE AC_CONFIG_AUX_DIR(m4) AM_INIT_AUTOMAKE([foreign]) +LT_INIT() AM_PROG_AS AC_LANG([C++]) AC_LANG([C]) AC_PROG_CXX + +AC_CHECK_PROG(MAKEINFO,[makeinfo],[makeinfo],[no]) +if test x"$MAKEINFO" == x"no" ; then +AC_MSG_ERROR([Please install texinfo]) +fi + +AC_CHECK_PROG(GETTEXT,[gettext],[gettext],[no]) +if test x"$GETTEXT" == x"no" ; then +AC_MSG_ERROR([Please install gettext]) +fi + +AC_CHECK_PROG(LIBTOOL,[libtool],[libtool],[no]) +if test x"$LIBTOOL" == x"no" ; then +AC_MSG_ERROR([Please install libtool]) +fi + CFG_CFLAGS+=" -fno-omit-frame-pointer -fno-math-errno -fno-signed-zeros" CFG_CFLAGS+=" -pthread -Wall" # misguided pedantic warnings @@ -205,7 +222,7 @@ PKG_3RD([esound],[no], [ . ]) PKG_3RD([ffmpeg],[yes], - [ffmpeg-4.4], + [ffmpeg-5.1], [ libavutil/libavutil.a \ libavcodec/libavcodec.a \ libpostproc/libpostproc.a \ @@ -238,7 +255,7 @@ PKG_3RD([fftw],[auto], [ api ]) PKG_3RD([flac],[auto], - [flac-1.3.2], + [flac-1.4.0], [ src/libFLAC/.libs/libFLAC.a \ src/libFLAC++/.libs/libFLAC++.a \ src/share/replaygain_analysis/.libs/libreplaygain_analysis.a \ @@ -296,7 +313,7 @@ PKG_3RD([opus],[auto], [ include ]) PKG_3RD([openjpeg],[auto], - [openjpeg-2.4.0], + [openjpeg-2.5.0], [ bin/libopenjp2.a ], [ src/lib/openjp2 ]) @@ -388,7 +405,7 @@ PKG_3RD([ilmBase],[auto], [ilmBase], [] []) # []) # PKG_3RD([tiff],[auto], - [tiff-4.3.0], + [tiff-4.4.0], [ libtiff/.libs/libtiff.a \ libtiff/.libs/libtiffxx.a \ port/.libs/libport.a ],[ @@ -410,7 +427,7 @@ PKG_3RD([x265],[auto], [ . source ]) PKG_3RD([libvpx],[auto], - [libvpx-1.11.0], + [libvpx-1.12.0], [ libvpx.a ], [ . ]) @@ -445,7 +462,7 @@ PKG_3RD([suil],[auto], [ usr/local/include ]) PKG_3RD([libaom],[auto], - [libaom-v3.2.0], + [libaom-v3.4.0], [ usr/local/lib*/libaom*.a ], [ usr/local/include ]) @@ -582,6 +599,8 @@ if test "x$HAVE_$1" != "xno"; then fi ]) +IMMATH_HEADERS=$(pkg-config --cflags Imath 2>/dev/null) + CHECK_LIB([X11], [X11], [XOpenDisplay]) CHECK_HEADERS([X11], [X11 headers], [X11/X.h X11/Xlib.h X11/Xutil.h X11/cursorfont.h]) CHECK_HEADERS([X11], [X11 headers], [X11/keysym.h X11/Sunkeysym.h X11/Xatom.h X11/XF86keysym.h]) @@ -624,6 +643,7 @@ CHECK_LIB([libsndfile], [sndfile], [sf_open]) CHECK_HEADERS([libsndfile], [sndfile headers], [sndfile.h]) CHECK_LIB([ilmbase], [IlmImf], [ImfOpenInputFile]) CHECK_HEADERS([ilmbase], [IlmImf headers], [OpenEXR/ImfCRgbaFile.h]) +CHECK_LIB([Imath], [Imath], [ImfOpenInputFile]) CHECK_LIB([libvpx], [vpx], [vpx_codec_decode]) CHECK_HEADERS([libvpx], [vpx headers], [vpx/vpx_decoder.h]) CHECK_LIB([mjpegtools], [mjpegutils], [mjpeg_info]) @@ -801,16 +821,16 @@ CHECK_WANT([LV2], [auto], [use lv2], [ CHECK_LIB([sord], [sord-0], [sord_world_new]) CHECK_LIB([serd], [serd-0], [serd_reader_new]) CHECK_LIB([sratom], [sratom-0], [sratom_new]) - CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0 `pkg-config --cflags lilv-0`" + CFLAGS="-I/usr/include/lilv-0 -I/usr/local/include/lilv-0 `pkg-config --cflags lilv-0 2>/dev/null`" CHECK_HEADERS([lilv], [lilv headers], [lilv/lilv.h]) - CFLAGS="-I/usr/include/serd-0 -I/usr/local/include/serd-0 `pkg-config --cflags serd-0`" + CFLAGS="-I/usr/include/serd-0 -I/usr/local/include/serd-0 `pkg-config --cflags serd-0 2>/dev/null`" CHECK_HEADERS([serd], [serd headers], [serd/serd.h]) - CFLAGS="-I/usr/include/sord-0 -I/usr/local/include/sord-0 `pkg-config --cflags sord-0`" + CFLAGS="-I/usr/include/sord-0 -I/usr/local/include/sord-0 `pkg-config --cflags sord-0 2>/dev/null`" CHECK_HEADERS([sord], [sord headers], [sord/sord.h]) - CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0`" + CFLAGS="-I/usr/include/sratom-0 -I/usr/local/include/sratom-0 `pkg-config --cflags sratom-0 2>/dev/null`" CHECK_HEADERS([sratom], [sratom headers], [sratom/sratom.h]) CHECK_LIB([suil], [suil-0], [suil_instance_new]) - CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags suil-0`" + CFLAGS="-I/usr/include/suil-0 -I/usr/local/include/suil-0 `pkg-config --cflags suil-0 2>/dev/null`" CHECK_HEADERS([suil], [suil headers], [suil/suil.h]) CFG_CFLAGS+=" $(pkg-config --cflags lilv-0) $(pkg-config --cflags suil-0)" LIBS="$saved_LIBS" @@ -847,7 +867,11 @@ CHECK_WANT([OPENEXR], [auto], [use openexr], [ saved_LIBS="$LIBS" saved_CXXFLAGS="$CXXFLAGS" # ilmbase libs + if test "xHAVE_Imath"="xyes"; then + LIBS=" -lImath -lIlmThread -lIex -lpthread" + else LIBS=" -lIlmImf -lIlmThread -lIex -lpthread" + fi CXXFLAGS="-I/usr/include/OpenEXR -I/usr/local/include/OpenEXR" CXXFLAGS+=" $(pkg-config --cflags OpenEXR)" AC_LANG_PUSH(C++) @@ -884,6 +908,13 @@ EXROStream() : Imf::OStream("mypath") {} }; AC_LANG_POP(C++) AC_MSG_RESULT([$HAVE_OPENEXR]) ]) + +if test "x$WANT_CIN_3RDPARTY" = "xno"; then + if test "x$HAVE_OPENEXR" != "xyes" -a "x$WANT_OPENEXR" = "xyes"; then + AC_MSG_ERROR([requires OpenEXR but OpenEXR not found.]) + fi +fi + AC_SUBST([HAVE_OPENEXR]) # have all or none test "x$HAVE_openexr" = "xyes" && \ @@ -1051,6 +1082,7 @@ done # build extras if test "x$WANT_CLANG" = "xyes" ; then FFMPEG_EXTRA_CFG+=' --cc=clang --cxx=clang++' + CFG_CFLAGS+=" -Wno-unknown-warning-option" fi if test "x$HAVE_tiff" = "xyes"; then if test "x$HAVE_jbig" = "xyes"; then