blob: 385f2aa27880c47e217203f063f66ddf430bcce3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
diff -ruN cinelerra-gg/cinelerra-5.1/configure.ac cinelerra-gg-new/cinelerra-5.1/configure.ac
--- cinelerra-gg/cinelerra-5.1/configure.ac 2018-11-02 16:41:41.523009718 +0800
+++ cinelerra-gg-new/cinelerra-5.1/configure.ac 2018-11-02 16:42:45.643716648 +0800
@@ -669,8 +669,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 -I/usr/local/include/OpenEXR"
@@ -678,9 +678,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`
@@ -724,7 +724,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
|