X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fconfigure.ac;h=0f2e2323106a1960816e6eaa6082abb1766dd2e7;hb=ef8f59c95a8966d70e5c2ecb89f0f22ea82e1e28;hp=9c69fa0126d64bfae984ce9b99a7e847d7c05651;hpb=7c199a42936462d662ee405fe0b4df5ac74850dc;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 9c69fa01..0f2e2323 100644
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -15,6 +15,7 @@ CFG_CFLAGS+=" -D__STDC_LIMIT_MACROS"
 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],
@@ -602,7 +603,7 @@ for dep in \
         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
@@ -705,10 +706,6 @@ AC_SUBST(FFMPEG_EXTRA_CFG)
 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)
 
@@ -767,7 +764,7 @@ if test  $WANT_X264_HIDEPTH = "yes" ; then
   echo "x264.cfg_params := --enable-static --bit-depth=10"
 fi
 if test  $WANT_X265_HIDEPTH = "yes" ; then
-  echo "x265.cfg_params := -DENABLE_SHARED=no -DHIGH_BIT_DEPTH:BOOL=ON"
+  echo "x265.cfg_params := -DENABLE_SHARED=no -DHIGH_BIT_DEPTH:BOOL=ON" # -DMAIN12:BOOL=ON"
 fi
 
 for pkg in $STATIC_PKGS; do echo "static_pkgs += $pkg"; done