diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1/configure.ac --- cinelerra-gg/cinelerra-5.1/configure.ac 2017-08-07 10:39:25.977492228 +0800 +++ cinelerra-gg-new/cinelerra-5.1/configure.ac 2017-08-07 10:37:58.000000000 +0800 @@ -547,8 +547,8 @@ EXRIStream() : Imf::IStream("mypath") {} }; class EXROStream : public Imf::OStream { public: EXROStream() : Imf::OStream("mypath") {} }; -]])], [HAVE_OPENEXR=yes], [HAVE_OPENEXR=no]) - RESULT="$HAVE_OPENEXR" +]])], [HAVE_openexr=yes], [HAVE_openexr=no]) + RESULT="$HAVE_openexr" if test "x$RESULT" = "xyes"; then SHARED_openexr="$LIBS" CFG_CFLAGS+=" -I/usr/include/OpenEXR" @@ -556,9 +556,9 @@ LIBS="$saved_LIBS" CXXFLAGS="$saved_CXXFLAGS" AC_LANG_POP(C++) - AC_MSG_RESULT([$HAVE_OPENEXR]) + AC_MSG_RESULT([$HAVE_openexr]) ]) -AC_SUBST([HAVE_OPENEXR]) +AC_SUBST([HAVE_openexr]) # build global_config OBJDIR=`uname -m` @@ -597,7 +597,7 @@ 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"; then + if test "x$pkg_lib" != "xno" -a "x$needs_lib" != "xyes"; then eval "PKG_$needs=yes" fi done