X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=ab06ace919e39c05b831b723690f44ecb2f27391;hb=06beeb092545344a90c4d8434327301e014aec0d;hp=1cf621b49cbcb95a0b8f4cc8dbf6ccc5c60f1c31;hpb=faaea1ce7a18979feba27c6e2127161995935a13;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 1cf621b4..ab06ace9 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 \
@@ -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 ])
 
@@ -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)
+
 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])
@@ -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" && \